rename

Author: AmlingPalantir

aggregator/src/lib.rs

@@ -115,7 +115,7 @@ impl<B: AggregatorBe + 'static> Registrant<BoxedAggregator> for AggregatorRegist
         return B::help_msg();
     }
 
-    fn init2(a: <B::Args as RegistryArgs>::Val) -> BoxedAggregator {
+    fn init(a: <B::Args as RegistryArgs>::Val) -> BoxedAggregator {
         return Box::new(AggregatorInboxImpl::<B>{
             a: Arc::new(a),
             s: B::State::default(),

clumper/src/lib.rs

@@ -78,7 +78,7 @@ impl<B: ClumperBe + 'static> Registrant<BoxedClumper> for ClumperRegistrant<B> {
         return B::help_msg();
     }
 
-    fn init2(a: <B::Args as RegistryArgs>::Val) -> BoxedClumper {
+    fn init(a: <B::Args as RegistryArgs>::Val) -> BoxedClumper {
         return Box::new(ClumperInboxImpl::<B>{
             a: Arc::new(a),
         });

deaggregator/src/lib.rs

@@ -75,7 +75,7 @@ impl<B: DeaggregatorBe + 'static> Registrant<BoxedDeaggregator> for Deaggregator
         return B::help_msg();
     }
 
-    fn init2(a: <B::Args as RegistryArgs>::Val) -> BoxedDeaggregator {
+    fn init(a: <B::Args as RegistryArgs>::Val) -> BoxedDeaggregator {
         return Box::new(DeaggregatorInboxImpl::<B>{
             a: Arc::new(a),
         });

executor/src/lib.rs

@@ -77,7 +77,7 @@ impl<B: ExecutorBe + 'static> Registrant<BoxedExecutor> for ExecutorRegistrant<B
         return B::help_msg();
     }
 
-    fn init2(_a: ()) -> BoxedExecutor {
+    fn init(_a: ()) -> BoxedExecutor {
         return Box::new(ExecutorInboxImpl {
             _b: std::marker::PhantomData::<B>,
         });

executor/src/lua/tests.rs

@@ -4,7 +4,7 @@ use super::Impl;
 
 fn test_one(i: &str, c: &str, o: &str) {
     let r = Record::parse(i);
-    let mut f = Impl::init2(()).parse(c).unwrap_or_else(|_| panic!()).stream(false);
+    let mut f = Impl::init(()).parse(c).unwrap_or_else(|_| panic!()).stream(false);
     let r = f(r);
     assert_eq!(r.deparse(), o);
 }

executor/src/r4l/tests.rs

@@ -4,7 +4,7 @@ use super::Impl;
 
 fn test_one(input: &str, c: &str, eret: &str, er: &str) {
     let r = Record::parse(input);
-    let c = Impl::init2(()).parse(c).unwrap_or_else(|_| panic!());
+    let c = Impl::init(()).parse(c).unwrap_or_else(|_| panic!());
 
     {
         let mut f = c.stream(false);

operation/src/clumper_options.rs

@@ -21,7 +21,7 @@ impl Optionsable for ClumperOptions {
         opt.add(clumper::REGISTRY.help_options("clumper"));
         opt.match_single(&["k", "key"], |p, a| {
             for a in a.split(',') {
-                (p.0).0.push(clumper::key::Impl::init2(Arc::from(a)));
+                (p.0).0.push(clumper::key::Impl::init(Arc::from(a)));
             }
             return Result::Ok(());
         }, "keys to bucket by");

operation/src/lib.rs

@@ -164,7 +164,7 @@ impl<B: OperationBe + 'static> Registrant<BoxedOperation> for OperationRegistran
         return B::help_msg();
     }
 
-    fn init2(_a: ()) -> BoxedOperation {
+    fn init(_a: ()) -> BoxedOperation {
         return Box::new(OperationInboxImpl::<B>::default());
     }
 }

operation/src/sort.rs

@@ -32,13 +32,13 @@ impl Optionsable for ImplBe2 {
         opt.add(SortOptions::help_options());
         opt.match_single(&["l", "lex", "lexical"], |p, a| {
             for a in a.split(',') {
-                p.sorts.push(sorts::lexical::Impl::init2(Arc::from(a)));
+                p.sorts.push(sorts::lexical::Impl::init(Arc::from(a)));
             }
             return Result::Ok(());
         }, "keys to sort by lexically, prefix with minus to sort descending");
         opt.match_single(&["n", "num", "numeric"], |p, a| {
             for a in a.split(',') {
-                p.sorts.push(sorts::numeric::Impl::init2(Arc::from(a)));
+                p.sorts.push(sorts::numeric::Impl::init(Arc::from(a)));
             }
             return Result::Ok(());
         }, "keys to sort by numerically, prefix with minus to sort descending");

registry/src/lib.rs

@@ -42,7 +42,7 @@ impl<R: 'static> Registry<R> {
             help_msg: I::help_msg(),
             init: Box::new(|args| {
                 let a = I::Args::parse(args)?;
-                let r = I::init2(a);
+                let r = I::init(a);
                 return Result::Ok(r);
             }),
         });
@@ -198,5 +198,5 @@ pub trait Registrant<R> {
     }
     fn help_msg() -> &'static str;
 
-    fn init2(a: <Self::Args as RegistryArgs>::Val) -> R;
+    fn init(a: <Self::Args as RegistryArgs>::Val) -> R;
 }