termprogress: Rename reporter() functions returning Box<dyn>

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

diff --git a/cli/clisupport.rs b/cli/clisupport.rs
index 71afb698dab2f67c284ecf6baa0a0d888207a1f3..e405f63218b26913a4b5cd8b4bd3e885fb7461e2 100644 (file)
--- a/cli/clisupport.rs
+++ b/cli/clisupport.rs
@@ -107,9 +107,9 @@ impl MainOpts {
   #[throws(AE)]
   pub fn progressbar(&self) -> Box<dyn termprogress::Reporter> {
     if self.verbose >= 0 {
-      termprogress::new()
+      termprogress::reporter()
     } else {
-      termprogress::Null::new()
+      termprogress::Null::reporter()
     }
   }
 }

diff --git a/src/termprogress.rs b/src/termprogress.rs
index 6ef4291c93f77877e5878c85022dd8ab2f8d330a..69a84f8d7f121b53b0018b7beef2c2f530984705 100644 (file)
--- a/src/termprogress.rs
+++ b/src/termprogress.rs
@@ -16,7 +16,7 @@ pub trait Reporter {
 
 pub struct Null;
 impl Null {
-  pub fn new() -> Box<dyn Reporter> { Box::new(Null) }
+  pub fn reporter() -> Box<dyn Reporter> { Box::new(Null) }
 }
 
 #[allow(unused_variables)]
@@ -25,7 +25,7 @@ impl Reporter for Null {
   fn clear(&mut self) { }
 }
 
-pub fn new() -> Box<dyn Reporter> {
+pub fn reporter() -> Box<dyn Reporter> {
   let term = console::Term::buffered_stderr();
 
   let mut newlines = false;