flip help_meta over to RegistryArgs (derived)

AmlingPalantir · AmlingPalantir · commit 256af3c72f09 · 2019-02-06T18:58:36.000-08:00
diff --git a/aggregator/src/array.rs b/aggregator/src/array.rs
@@ -16,10 +16,6 @@ impl AggregatorBe for ImplBe {
         return vec!["array", "arr"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "collect values into an array";
     }
diff --git a/aggregator/src/average.rs b/aggregator/src/average.rs
@@ -16,10 +16,6 @@ impl AggregatorBe for ImplBe {
         return vec!["average", "avg"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "compute average of numeric values";
     }
diff --git a/aggregator/src/concat.rs b/aggregator/src/concat.rs
@@ -22,10 +22,6 @@ impl AggregatorBe for ImplBe {
         return vec!["concatenate", "concat"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("delim,key");
-    }
-
     fn help_msg() -> &'static str {
         return "collect values into a string joined by a delimter";
     }
diff --git a/aggregator/src/count_by.rs b/aggregator/src/count_by.rs
@@ -18,10 +18,6 @@ impl AggregatorBe for ImplBe {
         return vec!["countby", "ctby", "cb"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "collect counts of values into a hash";
     }
diff --git a/aggregator/src/distinct_array.rs b/aggregator/src/distinct_array.rs
@@ -50,10 +50,6 @@ impl AggregatorBe for ImplBe {
         return vec!["darray", "darr"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "collect distinct values into an array";
     }
diff --git a/aggregator/src/distinct_concat.rs b/aggregator/src/distinct_concat.rs
@@ -23,10 +23,6 @@ impl AggregatorBe for ImplBe {
         return vec!["dconcatenate", "dconcat"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "collect distinct values into a string joined by a delimter";
     }
diff --git a/aggregator/src/distinct_count.rs b/aggregator/src/distinct_count.rs
@@ -16,10 +16,6 @@ impl AggregatorBe for ImplBe {
         return vec!["dcount", "dct"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "count distinct values";
     }
diff --git a/aggregator/src/first.rs b/aggregator/src/first.rs
@@ -15,10 +15,6 @@ impl AggregatorBe for ImplBe {
         return vec!["first"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the first value";
     }
diff --git a/aggregator/src/hash.rs b/aggregator/src/hash.rs
@@ -23,10 +23,6 @@ impl AggregatorBe for ImplBe {
         return vec!["hash"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key_key,value_key");
-    }
-
     fn help_msg() -> &'static str {
         return "collect pairs (key and value) of values into a hash";
     }
diff --git a/aggregator/src/last.rs b/aggregator/src/last.rs
@@ -15,10 +15,6 @@ impl AggregatorBe for ImplBe {
         return vec!["last"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the last value";
     }
diff --git a/aggregator/src/lexical_max.rs b/aggregator/src/lexical_max.rs
@@ -42,10 +42,6 @@ impl AggregatorBe for ImplBe {
         return vec!["lmax"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the lexically maximal value";
     }
diff --git a/aggregator/src/lexical_min.rs b/aggregator/src/lexical_min.rs
@@ -37,10 +37,6 @@ impl AggregatorBe for ImplBe {
         return vec!["lmin"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the lexically minimal value";
     }
diff --git a/aggregator/src/lexical_percentile.rs b/aggregator/src/lexical_percentile.rs
@@ -67,10 +67,6 @@ impl AggregatorBe for ImplBe {
         return vec!["lperc"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("percent,key");
-    }
-
     fn help_msg() -> &'static str {
         return "compute a percentile of values sorted lexically";
     }
diff --git a/aggregator/src/lib.rs b/aggregator/src/lib.rs
@@ -56,9 +56,6 @@ trait AggregatorBe {
     type State: Clone + Default + Send + Sync;
 
     fn names() -> Vec<&'static str>;
-    fn help_meta() -> Option<&'static str> {
-        return None;
-    }
     fn help_msg() -> &'static str;
     fn add(state: &mut Self::State, a: &Self::Args, r: Record);
     fn finish(state: Self::State, a: &Self::Args) -> Record;
@@ -110,10 +107,6 @@ impl<B: AggregatorBe + 'static> Registrant<BoxedAggregator> for AggregatorRegist
         return B::names();
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return B::help_meta();
-    }
-
     fn help_msg() -> &'static str {
         return B::help_msg();
     }
diff --git a/aggregator/src/linear_regression.rs b/aggregator/src/linear_regression.rs
@@ -34,10 +34,6 @@ impl AggregatorBe for ImplBe {
         return vec!["linreg"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("x_key,y_key");
-    }
-
     fn help_msg() -> &'static str {
         return "compute a linear regression from pairs of values";
     }
diff --git a/aggregator/src/max.rs b/aggregator/src/max.rs
@@ -18,10 +18,6 @@ impl AggregatorBe for ImplBe {
         return vec!["max"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the numerically maximal value";
     }
diff --git a/aggregator/src/min.rs b/aggregator/src/min.rs
@@ -19,10 +19,6 @@ impl AggregatorBe for ImplBe {
         return vec!["min"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the numerically minimal value";
     }
diff --git a/aggregator/src/percentile.rs b/aggregator/src/percentile.rs
@@ -18,10 +18,6 @@ impl AggregatorBe for ImplBe {
         return vec!["perc"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("percent,key");
-    }
-
     fn help_msg() -> &'static str {
         return "compute a percentile of values sorted numerically";
     }
diff --git a/aggregator/src/record_for_lexical_max.rs b/aggregator/src/record_for_lexical_max.rs
@@ -18,10 +18,6 @@ impl AggregatorBe for ImplBe {
         return vec!["recforlmax"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the record for the lexically maximal value";
     }
diff --git a/aggregator/src/record_for_lexical_min.rs b/aggregator/src/record_for_lexical_min.rs
@@ -19,10 +19,6 @@ impl AggregatorBe for ImplBe {
         return vec!["recforlmin"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the record for the lexically minimal value";
     }
diff --git a/aggregator/src/record_for_lexical_percentile.rs b/aggregator/src/record_for_lexical_percentile.rs
@@ -18,10 +18,6 @@ impl AggregatorBe for ImplBe {
         return vec!["recforlperc"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("percentile,key");
-    }
-
     fn help_msg() -> &'static str {
         return "find the record for a percentile when records are sorted lexically by a value";
     }
diff --git a/aggregator/src/record_for_max.rs b/aggregator/src/record_for_max.rs
@@ -18,10 +18,6 @@ impl AggregatorBe for ImplBe {
         return vec!["recformax"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the record for the numerically maximal value";
     }
diff --git a/aggregator/src/record_for_min.rs b/aggregator/src/record_for_min.rs
@@ -19,10 +19,6 @@ impl AggregatorBe for ImplBe {
         return vec!["recformin"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "track the record for the numerically minimal value";
     }
diff --git a/aggregator/src/record_for_percentile.rs b/aggregator/src/record_for_percentile.rs
@@ -18,10 +18,6 @@ impl AggregatorBe for ImplBe {
         return vec!["recforperc"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("percentile,key");
-    }
-
     fn help_msg() -> &'static str {
         return "find the record for a percentile when records are sorted numerically by a value";
     }
diff --git a/aggregator/src/sample.rs b/aggregator/src/sample.rs
@@ -24,10 +24,6 @@ impl AggregatorBe for ImplBe {
         return vec!["sample"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("count,key");
-    }
-
     fn help_msg() -> &'static str {
         return "sample a specified number of values";
     }
diff --git a/aggregator/src/standard_deviation.rs b/aggregator/src/standard_deviation.rs
@@ -16,10 +16,6 @@ impl AggregatorBe for ImplBe {
         return vec!["stddev", "sd"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "compute standard deviation of numeric values";
     }
diff --git a/aggregator/src/sum.rs b/aggregator/src/sum.rs
@@ -26,10 +26,6 @@ impl AggregatorBe for ImplBe {
         return vec!["sum"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "compute sum of numeric values";
     }
diff --git a/clumper/src/key.rs b/clumper/src/key.rs
@@ -18,10 +18,6 @@ impl ClumperBe for ImplBe {
         return vec!["key", "k"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("key");
-    }
-
     fn help_msg() -> &'static str {
         return "bucket records by values of one key";
     }
diff --git a/clumper/src/lib.rs b/clumper/src/lib.rs
@@ -29,9 +29,6 @@ pub trait ClumperBe {
     type Args: RegistryArgs;
 
     fn names() -> Vec<&'static str>;
-    fn help_meta() -> Option<&'static str> {
-        return None;
-    }
     fn help_msg() -> &'static str;
     fn stream(a: &Self::Args, bsw: Box<Fn(Vec<(Arc<str>, Record)>) -> Stream>) -> Stream;
 }
@@ -74,10 +71,6 @@ impl<B: ClumperBe + 'static> Registrant<BoxedClumper> for ClumperRegistrant<B> {
         return B::names();
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return B::help_meta();
-    }
-
     fn help_msg() -> &'static str {
         return B::help_msg();
     }
diff --git a/clumper/src/round_robin.rs b/clumper/src/round_robin.rs
@@ -20,10 +20,6 @@ impl ClumperBe for ImplBe {
         return vec!["round-robin", "rr"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("count");
-    }
-
     fn help_msg() -> &'static str {
         return "bucket records rotating between a specified number of buckets";
     }
diff --git a/clumper/src/window.rs b/clumper/src/window.rs
@@ -22,10 +22,6 @@ impl ClumperBe for ImplBe {
         return vec!["window"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("count");
-    }
-
     fn help_msg() -> &'static str {
         return "'bucket' records by making a bucket for each [overlapping] window of a specified size";
     }
diff --git a/deaggregator/src/lib.rs b/deaggregator/src/lib.rs
@@ -26,9 +26,6 @@ trait DeaggregatorBe {
     type Args: RegistryArgs;
 
     fn names() -> Vec<&'static str>;
-    fn help_meta() -> Option<&'static str> {
-        return None;
-    }
     fn help_msg() -> &'static str;
     fn deaggregate(a: &Self::Args, r: Record) -> Vec<Vec<(Arc<str>, Record)>>;
 }
@@ -71,10 +68,6 @@ impl<B: DeaggregatorBe + 'static> Registrant<BoxedDeaggregator> for Deaggregator
         return B::names();
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return B::help_meta();
-    }
-
     fn help_msg() -> &'static str {
         return B::help_msg();
     }
diff --git a/deaggregator/src/split.rs b/deaggregator/src/split.rs
@@ -22,10 +22,6 @@ impl DeaggregatorBe for ImplBe {
         return vec!["split"];
     }
 
-    fn help_meta() -> Option<&'static str> {
-        return Some("in_key,delimiter,out_key");
-    }
-
     fn help_msg() -> &'static str {
         return "split one value and output one record per split piece";
     }
diff --git a/deaggregator/src/unarray.rs b/deaggregator/src/unarray.rs
diff --git a/deaggregator/src/unhash.rs b/deaggregator/src/unhash.rs
diff --git a/executor/src/lib.rs b/executor/src/lib.rs
diff --git a/operation/src/lib.rs b/operation/src/lib.rs
diff --git a/registry/src/lib.rs b/registry/src/lib.rs
diff --git a/sorts/src/lexical.rs b/sorts/src/lexical.rs
diff --git a/sorts/src/lib.rs b/sorts/src/lib.rs
diff --git a/sorts/src/numeric.rs b/sorts/src/numeric.rs

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,6 @@ impl AggregatorBe for ImplBe {`
`16`	`16`	`return vec!["array", "arr"];`
`17`	`17`	`}`
`18`	`18`
`19`		`- fn help_meta() -> Option<&'static str> {`
`20`		`- return Some("key");`
`21`		`- }`
`22`		`-`
`23`	`19`	`fn help_msg() -> &'static str {`
`24`	`20`	`return "collect values into an array";`
`25`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,6 @@ impl AggregatorBe for ImplBe {`
`22`	`22`	`return vec!["concatenate", "concat"];`
`23`	`23`	`}`
`24`	`24`
`25`		`- fn help_meta() -> Option<&'static str> {`
`26`		`- return Some("delim,key");`
`27`		`- }`
`28`		`-`
`29`	`25`	`fn help_msg() -> &'static str {`
`30`	`26`	`return "collect values into a string joined by a delimter";`
`31`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,6 @@ impl AggregatorBe for ImplBe {`
`18`	`18`	`return vec!["countby", "ctby", "cb"];`
`19`	`19`	`}`
`20`	`20`
`21`		`- fn help_meta() -> Option<&'static str> {`
`22`		`- return Some("key");`
`23`		`- }`
`24`		`-`
`25`	`21`	`fn help_msg() -> &'static str {`
`26`	`22`	`return "collect counts of values into a hash";`
`27`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,6 @@ impl AggregatorBe for ImplBe {`
`50`	`50`	`return vec!["darray", "darr"];`
`51`	`51`	`}`
`52`	`52`
`53`		`- fn help_meta() -> Option<&'static str> {`
`54`		`- return Some("key");`
`55`		`- }`
`56`		`-`
`57`	`53`	`fn help_msg() -> &'static str {`
`58`	`54`	`return "collect distinct values into an array";`
`59`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,6 @@ impl AggregatorBe for ImplBe {`
`23`	`23`	`return vec!["dconcatenate", "dconcat"];`
`24`	`24`	`}`
`25`	`25`
`26`		`- fn help_meta() -> Option<&'static str> {`
`27`		`- return Some("key");`
`28`		`- }`
`29`		`-`
`30`	`26`	`fn help_msg() -> &'static str {`
`31`	`27`	`return "collect distinct values into a string joined by a delimter";`
`32`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@ impl AggregatorBe for ImplBe {`
`15`	`15`	`return vec!["first"];`
`16`	`16`	`}`
`17`	`17`
`18`		`- fn help_meta() -> Option<&'static str> {`
`19`		`- return Some("key");`
`20`		`- }`
`21`		`-`
`22`	`18`	`fn help_msg() -> &'static str {`
`23`	`19`	`return "track the first value";`
`24`	`20`	`}`