middleground

crates/tests/riddle/src/lib.rs

@@ -33,7 +33,7 @@ pub fn run_riddle(name: &str) -> Vec<windows_metadata::File> {
     let mut command = Command::new("cargo");
     command.args([
         "run", "-p", "riddle", "--", "--in", &idl, "--out", &rs, "--filter", "Test",
-    ]); // TODO: -config FLATTEN doesn't work for namespaces
+    ]); // TODO: --config FLATTEN doesn't work for namespaces
     assert!(command.status().unwrap().success());
 
     // Return winmd file for validation

crates/tests/standalone/build.rs

@@ -168,7 +168,7 @@ fn riddle(output: &str, filter: &[&str], config: &[&str]) {
     ]);
 
     command.args(filter);
-    command.arg("-config");
+    command.arg("--config");
     command.args(config);
 
     if !command.status().unwrap().success() {

crates/tools/core/src/main.rs

@@ -6,7 +6,7 @@ fn main() {
         "-p",
         "riddle",
         "--",
-        "-@",
+        "--etc",
         "crates/tools/core/bindings.txt",
     ]);
 
@@ -19,7 +19,7 @@ fn main() {
         "-p",
         "riddle",
         "--",
-        "-@",
+        "--etc",
         "crates/tools/core/com_bindings.txt",
     ]);
 

crates/tools/metadata/src/main.rs

@@ -6,7 +6,7 @@ fn main() {
         "-p",
         "riddle",
         "--",
-        "-@",
+        "--etc",
         "crates/tools/metadata/bindings.txt",
     ]);
 

crates/tools/riddle/src/args.rs

@@ -28,7 +28,7 @@ fn from_iter<T: Iterator<Item = String>>(result: &mut Vec<String>, args: T) -> R
             for args in crate::read_file_lines(&arg)? {
                 from_string(result, &args)?;
             }
-        } else if arg == "-@" {
+        } else if arg == "--etc" {
             expand = true;
         } else {
             result.push(arg);

crates/tools/riddle/src/main.rs

@@ -33,12 +33,12 @@ fn run() -> Result<()> {
             r#"Usage: riddle.exe [options...]
 
 Options:
-  -i,--in  <path>          Path to files and directories containing .winmd and .idl files
-  -o,--out <path>          Path to .winmd, .idl, or .rs file to generate
-  -f,--filter <namespace>  Namespaces to include or !exclude in output
-  -c,--config <key=value>  Override a configuration value
-  --format                 Format .idl files only
-  -@ <path>                File containing command line options
+  --in  <path>          Path to files and directories containing .winmd and .idl files
+  --out <path>          Path to .winmd, .idl, or .rs file to generate
+  --filter <namespace>  Namespaces to include or !exclude in output
+  --config <key=value>  Override a configuration value
+  --format              Format .idl files only
+  --etc <path>          File containing command line options
 "#
         );
         return Ok(());
@@ -60,11 +60,8 @@ Options:
         match kind {
             ArgKind::None => match arg.as_str() {
                 "--in" => kind = ArgKind::Input,
-                "-i" => kind = ArgKind::Input,
                 "--out" => kind = ArgKind::Output,
-                "-o" => kind = ArgKind::Output,
                 "--filter" => kind = ArgKind::Filter,
-                "-c" => kind = ArgKind::Config,
                 "--config" => kind = ArgKind::Config,
                 "--format" => format = true,
                 _ => return Err(Error::new(&format!("invalid option `{arg}`"))),

crates/tools/sys/src/main.rs

@@ -6,7 +6,7 @@ fn main() {
         "-p",
         "riddle",
         "--",
-        "-@",
+        "--etc",
         "crates/tools/sys/bindings.txt",
     ]);
 

crates/tools/windows/src/main.rs

@@ -6,7 +6,7 @@ fn main() {
         "-p",
         "riddle",
         "--",
-        "-@",
+        "--etc",
         "crates/tools/windows/bindings.txt",
     ]);