From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 13 May 2021 20:30:42 +0000 (+0100)
Subject: progress: Rename Originator (from Reporter)
X-Git-Tag: otter-0.6.0~309
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=147f42943f40b861c874165589e9f9c8ec563681;p=otter.git

progress: Rename Originator (from Reporter)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bundles.rs b/src/bundles.rs
index 40a8d515..71e307c3 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -482,7 +482,7 @@ impl progress::Enum for ReaquireProgress { }
 
 #[throws(EH::Err)]
 fn parse_bundle<EH>(id: Id, instance: &InstanceName, file: File, eh: EH,
-                    mut for_progress: &mut dyn progress::Reporter)
+                    mut for_progress: &mut dyn progress::Originator)
                     -> (ForProcess, Parsed)
   where EH: BundleParseErrorHandling,
 {
@@ -599,7 +599,7 @@ fn parse_bundle<EH>(id: Id, instance: &InstanceName, file: File, eh: EH,
 #[throws(LE)]
 fn process_bundle(ForProcess { mut za, mut newlibs }: ForProcess,
                   id: Id, instance: &InstanceName,
-                  mut for_progress: &mut dyn progress::Reporter)
+                  mut for_progress: &mut dyn progress::Originator)
 {
   for_progress.phase_item(Phase::Reaquire, ReaquireProgress::Prepare);
 
@@ -634,7 +634,7 @@ enum PictureFormat {
 
 #[throws(LE)]
 fn make_usvg(za: &mut IndexedZip, progress_count: &mut usize,
-             mut for_progress: &mut dyn progress::Reporter,
+             mut for_progress: &mut dyn progress::Originator,
              dir_inzip: &str, svg_dir: &str,
              item: &GoodItemName) {
   let (format, mut zf) = 'format: loop {
@@ -829,8 +829,8 @@ impl Uploading {
                     for_progress: &mut ResponseWriter<PW>) -> Uploaded
   where R: Read, PW: Write
   {
-    let mut for_progress = progress::ResponseReporter::new(for_progress);
-    let mut for_progress: &mut dyn progress::Reporter = &mut for_progress;
+    let mut for_progress = progress::ResponseOriginator::new(for_progress);
+    let mut for_progress: &mut dyn progress::Originator = &mut for_progress;
 
     for_progress.phase_item(Phase::Upload, ());
 
diff --git a/src/prelude.rs b/src/prelude.rs
index c010b8f9..f68a9714 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -150,7 +150,7 @@ pub use crate::packetframe::{ReadExt, ResponseWriter};
 pub use crate::pcaliases::*;
 pub use crate::pcrender::*;
 pub use crate::pieces::*;
-pub use crate::progress::{self, ProgressInfo, ReporterExt as _};
+pub use crate::progress::{self, ProgressInfo, OriginatorExt as _};
 pub use crate::shapelib;
 pub use crate::shapelib::{CircleShape, RectShape, LibraryLoadError};
 pub use crate::slotmap_slot_idx::*;
diff --git a/src/progress.rs b/src/progress.rs
index 8504f477..232b6ab3 100644
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -17,18 +17,18 @@ pub struct Count<'pi> {
   pub desc: Cow<'pi, str>,
 }
 
-pub trait Reporter {
+pub trait Originator {
   fn report(&mut self, info: ProgressInfo<'_>);
   fn phase_begin_(&mut self, phase: Count<'_>, len: usize);
   fn item_(&mut self, item: usize, desc: Cow<'_, str>);
 }
 
-pub struct ResponseReporter<'c,'w,W> where W: Write {
+pub struct ResponseOriginator<'c,'w,W> where W: Write {
   chan: &'c mut ResponseWriter<'w,W>,
   phase: Count<'static>,
   len: usize,
 }
-impl<'c,'w,W> ResponseReporter<'c,'w,W> where W: Write {
+impl<'c,'w,W> ResponseOriginator<'c,'w,W> where W: Write {
   pub fn new(chan: &'c mut ResponseWriter<'w,W>) -> Self { Self {
     chan,
     phase: Count { i:0, n:0, desc: Cow::Borrowed("") },
@@ -36,7 +36,7 @@ impl<'c,'w,W> ResponseReporter<'c,'w,W> where W: Write {
   } }
 }
 
-impl<W> Reporter for ResponseReporter<'_,'_,W> where W: Write {
+impl<W> Originator for ResponseOriginator<'_,'_,W> where W: Write {
   fn report(&mut self, pi: ProgressInfo<'_>) {
     self.chan.progress(pi).unwrap_or(());
   }
@@ -53,7 +53,7 @@ impl<W> Reporter for ResponseReporter<'_,'_,W> where W: Write {
 }
 
 #[allow(unused_variables)]
-impl Reporter for () {
+impl Originator for () {
   fn report(&mut self, pi: ProgressInfo<'_>) { }
   fn phase_begin_(&mut self, phase: Count<'_>, len: usize) { }
   fn item_(&mut self, item: usize, desc: Cow<'_, str>) { }
@@ -84,8 +84,8 @@ impl<'t> From<()> for Count<'t> { fn from(_:()) -> Count<'t> {
     Count { i:0, n:0, desc: Cow::Borrowed("") }
 } }
 
-#[ext(pub, name=ReporterExt)]
-impl &mut dyn Reporter {
+#[ext(pub, name=OriginatorExt)]
+impl &mut dyn Originator {
   fn phase_item<'p,'e,P,E>(&mut self, phase: P, item: E)
   where P: Into<Count<'p>>,
         E: Into<Count<'e>>,