wrong wrong wrong

Author: AmlingPalantir

operation/src/expand_files.rs

@@ -8,8 +8,7 @@ use std::io::BufReader;
 use std::sync::Arc;
 use stream::Entry;
 use stream::Stream;
-use super::OperationBe2;
-use super::OperationBeForBe2;
+use super::OperationBe;
 use super::OperationRegistrant;
 use super::SubOperationOption;
 use super::TwoRecordUnionOption;
@@ -28,11 +27,9 @@ pub struct Options {
 
 pub(crate) type Impl = OperationRegistrant<ImplBe>;
 
-pub(crate) type ImplBe = OperationBeForBe2<ImplBe2>;
+pub(crate) struct ImplBe();
 
-pub(crate) struct ImplBe2();
-
-impl Optionsable for ImplBe2 {
+impl Optionsable for ImplBe {
     type Options = Options;
 
     fn options(opt: &mut OptionsPile<Options>) {
@@ -42,7 +39,7 @@ impl Optionsable for ImplBe2 {
     }
 }
 
-impl OperationBe2 for ImplBe2 {
+impl OperationBe for ImplBe {
     fn names() -> Vec<&'static str> {
         return vec!["expand-files"];
     }
@@ -51,6 +48,10 @@ impl OperationBe2 for ImplBe2 {
         return "run an operation on multiple files, themselves listed in input record values";
     }
 
+    fn get_extra(o: Arc<OptionsValidated>) -> Vec<String> {
+        return o.op.extra.clone();
+    }
+
     fn stream(o: Arc<OptionsValidated>) -> Stream {
         return stream::closures(
             (),

operation/src/expand_lines.rs

@@ -5,8 +5,7 @@ use record::RecordTrait;
 use std::sync::Arc;
 use stream::Entry;
 use stream::Stream;
-use super::OperationBe2;
-use super::OperationBeForBe2;
+use super::OperationBe;
 use super::OperationRegistrant;
 use super::SubOperationOption;
 use super::TwoRecordUnionOption;
@@ -25,11 +24,9 @@ pub struct Options {
 
 pub(crate) type Impl = OperationRegistrant<ImplBe>;
 
-pub(crate) type ImplBe = OperationBeForBe2<ImplBe2>;
+pub(crate) struct ImplBe();
 
-pub(crate) struct ImplBe2();
-
-impl Optionsable for ImplBe2 {
+impl Optionsable for ImplBe {
     type Options = Options;
 
     fn options(opt: &mut OptionsPile<Options>) {
@@ -39,7 +36,7 @@ impl Optionsable for ImplBe2 {
     }
 }
 
-impl OperationBe2 for ImplBe2 {
+impl OperationBe for ImplBe {
     fn names() -> Vec<&'static str> {
         return vec!["expand-lines"];
     }
@@ -48,6 +45,10 @@ impl OperationBe2 for ImplBe2 {
         return "run an operation on individual lines, themselves read from input record values";
     }
 
+    fn get_extra(o: Arc<OptionsValidated>) -> Vec<String> {
+        return o.op.extra.clone();
+    }
+
     fn stream(o: Arc<OptionsValidated>) -> Stream {
         return stream::closures(
             (),

operation/src/provenance.rs

@@ -5,8 +5,7 @@ use record::Record;
 use std::sync::Arc;
 use stream::Entry;
 use stream::Stream;
-use super::OperationBe2;
-use super::OperationBeForBe2;
+use super::OperationBe;
 use super::OperationRegistrant;
 use super::SubOperationOption;
 
@@ -23,11 +22,9 @@ pub struct Options {
 
 pub(crate) type Impl = OperationRegistrant<ImplBe>;
 
-pub(crate) type ImplBe = OperationBeForBe2<ImplBe2>;
+pub(crate) struct ImplBe();
 
-pub(crate) struct ImplBe2();
-
-impl Optionsable for ImplBe2 {
+impl Optionsable for ImplBe {
     type Options = Options;
 
     fn options(opt: &mut OptionsPile<Options>) {
@@ -36,7 +33,7 @@ impl Optionsable for ImplBe2 {
     }
 }
 
-impl OperationBe2 for ImplBe2 {
+impl OperationBe for ImplBe {
     fn names() -> Vec<&'static str> {
         return vec!["provenance"];
     }
@@ -45,6 +42,10 @@ impl OperationBe2 for ImplBe2 {
         return "run an operation on individual inputs and stamp outputs with original input";
     }
 
+    fn get_extra(o: Arc<OptionsValidated>) -> Vec<String> {
+        return o.op.extra.clone();
+    }
+
     fn stream(o: Arc<OptionsValidated>) -> Stream {
         return stream::closures(
             o.op.wr.stream(),