cli: Rename opt.rs to args.rs

This has bothered me for so long

unplug-cli/src/commands.rs

@@ -16,8 +16,8 @@ pub mod stage;
 #[cfg(feature = "debug")]
 pub mod debug;
 
+use crate::args::Command;
 use crate::context::Context;
-use crate::opt::Command;
 use anyhow::Result;
 
 /// Runs a CLI command using `ctx`.

unplug-cli/src/commands/archive.rs

@@ -1,4 +1,4 @@
-use crate::opt::archive::*;
+use crate::args::archive::*;
 
 use crate::common::output_dir_and_name;
 use crate::context::Context;

unplug-cli/src/commands/audio.rs

@@ -1,4 +1,4 @@
-use crate::opt::audio::*;
+use crate::args::audio::*;
 
 use crate::common::{format_duration, output_dir_and_name};
 use crate::context::{Context, FileId, OpenContext};

unplug-cli/src/commands/config.rs

@@ -1,4 +1,4 @@
-use crate::opt::config::*;
+use crate::args::config::*;
 
 use crate::config::{Config, Settings};
 use crate::context::Context;

unplug-cli/src/commands/debug.rs

@@ -1,4 +1,4 @@
-use crate::opt::debug::*;
+use crate::args::debug::*;
 
 use crate::context::Context;
 use anyhow::Result;

unplug-cli/src/commands/dolphin.rs

@@ -1,4 +1,4 @@
-use crate::opt::dolphin::*;
+use crate::args::dolphin::*;
 
 use crate::config::Config;
 use crate::context::Context;

unplug-cli/src/commands/globals.rs

@@ -1,4 +1,4 @@
-use crate::opt::globals::*;
+use crate::args::globals::*;
 
 use crate::context::Context;
 use crate::io::OutputRedirect;

unplug-cli/src/commands/iso.rs

@@ -1,4 +1,4 @@
-use crate::opt::iso::*;
+use crate::args::iso::*;
 
 use crate::common::output_dir_and_name;
 use crate::context::Context;

unplug-cli/src/commands/list.rs

@@ -1,4 +1,4 @@
-use crate::opt::list::*;
+use crate::args::list::*;
 
 use crate::context::Context;
 use anyhow::Result;

unplug-cli/src/commands/messages.rs

@@ -1,4 +1,4 @@
-use crate::opt::messages::*;
+use crate::args::messages::*;
 
 use crate::context::Context;
 use crate::msg::{self, MessageId, MessageReader, MessageSource, MessageWriter};

unplug-cli/src/commands/project.rs

@@ -1,4 +1,4 @@
-use crate::opt::project::*;
+use crate::args::project::*;
 
 use crate::common::IString;
 use crate::config::{Config, Project, ProjectKind};

unplug-cli/src/commands/script.rs

@@ -1,4 +1,4 @@
-use crate::opt::script::*;
+use crate::args::script::*;
 
 use crate::common::find_stage_file;
 use crate::context::Context;
@@ -288,8 +288,8 @@ fn command_assemble(ctx: Context, args: AssembleArgs) -> Result<()> {
 }
 
 /// The `script` CLI command.
-pub fn command(ctx: Context, args: Subcommand) -> Result<()> {
-    match args {
+pub fn command(ctx: Context, command: Subcommand) -> Result<()> {
+    match command {
         Subcommand::Dump(args) if args.stage == "globals" => command_dump_globals(ctx, args),
         Subcommand::Dump(args) => command_dump(ctx, args),
         Subcommand::DumpAll(args) => command_dump_all(ctx, args),

unplug-cli/src/commands/shop.rs

@@ -1,4 +1,4 @@
-use crate::opt::shop::*;
+use crate::args::shop::*;
 
 use crate::context::Context;
 use crate::io::OutputRedirect;

unplug-cli/src/commands/stage.rs

@@ -1,4 +1,4 @@
-use crate::opt::stage::*;
+use crate::args::stage::*;
 
 use crate::common::find_stage_file;
 use crate::context::Context;

unplug-cli/src/fst.rs

@@ -1,4 +1,4 @@
-use crate::opt::list::Options;
+use crate::args::list::Options;
 use anyhow::{bail, Result};
 use log::info;
 use std::fs::{self, File};

unplug-cli/src/lib.rs

@@ -1,3 +1,4 @@
+pub mod args;
 pub mod commands;
 pub mod common;
 pub mod config;
@@ -7,6 +8,5 @@ pub mod id;
 pub mod io;
 pub mod json;
 pub mod msg;
-pub mod opt;
 pub mod playback;
 pub mod terminal;

unplug-cli/src/main.rs

@@ -3,9 +3,9 @@ use clap::Parser;
 use log::error;
 use std::path::Path;
 use std::process;
+use unplug_cli::args::{CliArgs, GlobalConfigArgs, GlobalContextArgs};
 use unplug_cli::config::{self, Config};
 use unplug_cli::context::Context;
-use unplug_cli::opt::{CliArgs, GlobalConfigArgs, GlobalContextArgs};
 use unplug_cli::{commands, terminal};
 
 #[cfg(feature = "trace")]

unplug-cli/tests/reimport_globals.rs

@@ -4,9 +4,9 @@ use std::fs::File;
 use tempfile::NamedTempFile;
 use unplug::dvd::{ArchiveReader, DiscStream, OpenFile};
 use unplug::globals::GlobalsReader;
+use unplug_cli::args::globals::{ExportArgs, ImportArgs};
 use unplug_cli::commands::globals;
 use unplug_cli::context::Context;
-use unplug_cli::opt::globals::{ExportArgs, ImportArgs};
 use unplug_test as common;
 
 #[test]

unplug-cli/tests/reimport_messages.rs

@@ -8,10 +8,10 @@ use unplug::event::msg::MsgArgs;
 use unplug::event::Script;
 use unplug::globals::GlobalsReader;
 use unplug::stage::Stage;
+use unplug_cli::args::messages::{ExportArgs, ImportArgs};
 use unplug_cli::commands::messages;
 use unplug_cli::context::Context;
 use unplug_cli::msg::{iter_messages, MessageId, MessageSource};
-use unplug_cli::opt::messages::{ExportArgs, ImportArgs};
 use unplug_test as common;
 
 fn collect_messages(source: MessageSource, script: &Script) -> Vec<(MessageId, &MsgArgs)> {

unplug-cli/tests/reimport_shop.rs

@@ -8,9 +8,9 @@ use unplug::dvd::{ArchiveReader, DiscStream, OpenFile};
 use unplug::globals::GlobalsReader;
 use unplug::shop::Shop;
 use unplug::stage::Stage;
+use unplug_cli::args::shop::{ExportArgs, ImportArgs};
 use unplug_cli::commands::shop;
 use unplug_cli::context::Context;
-use unplug_cli::opt::shop::{ExportArgs, ImportArgs};
 use unplug_test as common;
 
 #[test]

unplug-cli/tests/reimport_stages.rs

@@ -6,9 +6,9 @@ use unplug::data::{Resource, Stage as StageId};
 use unplug::dvd::{ArchiveReader, DiscStream, OpenFile};
 use unplug::globals::GlobalsReader;
 use unplug::stage::Stage;
+use unplug_cli::args::stage::{ExportAllArgs, ImportAllArgs};
 use unplug_cli::commands::stage;
 use unplug_cli::context::Context;
-use unplug_cli::opt::stage::{ExportAllArgs, ImportAllArgs};
 use unplug_test as common;
 
 #[test]