From 31f2b649c19274649eae2d2d0c4edff84ad011ad Mon Sep 17 00:00:00 2001 From: Loris FRIEDEL Date: Wed, 03 Nov 2021 13:25:06 +0000 Subject: [PATCH] Enable multi-occurences for --jpath + improve positional params error message --- --- a/crates/jrsonnet-cli/src/lib.rs +++ b/crates/jrsonnet-cli/src/lib.rs @@ -51,7 +51,7 @@ /// Any not found `imported` file will be searched in these. /// This can also be specified via `JSONNET_PATH` variable, /// which should contain a colon-separated (semicolon-separated on Windows) list of directories. - #[clap(long, short = 'J')] + #[clap(long, short = 'J', multiple_occurrences = true)] jpath: Vec, } impl ConfigureState for MiscOpts { --- a/crates/jrsonnet-parser/src/lib.rs +++ b/crates/jrsonnet-parser/src/lib.rs @@ -62,7 +62,7 @@ let mut defaults_started = false; for param in ¶ms { defaults_started = defaults_started || param.1.is_some(); - assert_eq!(defaults_started, param.1.is_some(), "defauld parameters should be used after all positionals"); + assert_eq!(defaults_started, param.1.is_some(), "defauld parameters should be used after all positionals. Misplaced default parameter: {:?}", param.0); } expr::ParamsDesc(Rc::new(params)) } -- gitstuff