Rename cargo test-examples to cargo xtask test-examples

qryxip · qryxip · commit 9a6d858db789 · 2020-05-27T21:31:12.000+09:00
diff --git a/.cargo/config b/.cargo/config
@@ -1,2 +1,2 @@
 [alias]
-test-examples = ["run", "--manifest-path", "./tools/test-examples/Cargo.toml", "--"]
+xtask = ["run", "--manifest-path", "./xtask/Cargo.toml", "--", "xtask"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,11 +38,11 @@ jobs:
           command: fmt
           args: -- --check
 
-      - name: '`cargo fmt --manifest-path ./tools/test-examples/Cargo.toml -- --check`'
+      - name: '`cargo fmt --manifest-path ./xtask/Cargo.toml -- --check`'
         uses: actions-rs/cargo@v1
         with:
           command: fmt
-          args: --manifest-path ./tools/test-examples/Cargo.toml -- --check
+          args: --manifest-path ./xtask/Cargo.toml -- --check
 
   build:
     strategy:
@@ -118,11 +118,11 @@ jobs:
           command: clippy
           args: --all-targets --profile test -- -D warnings
 
-      - name: '`cargo clippy --manifest-path ./tools/test-examples/Cargo.toml -- -D warnings`'
+      - name: '`cargo clippy --manifest-path ./xtask/Cargo.toml -- -D warnings`'
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --manifest-path ./tools/test-examples/Cargo.toml -- -D warnings
+          args: --manifest-path ./xtask/Cargo.toml -- -D warnings
 
       - name: '`cargo test --all-targets --no-fail-fast`'
         uses: actions-rs/cargo@v1
@@ -136,7 +136,8 @@ jobs:
           command: run
           args: --release
 
-      - name: '`cargo test-examples`'
+      - name: '`cargo xtask test-examples`'
         uses: actions-rs/cargo@v1
         with:
-          command: test-examples
+          command: xtask
+          args: test-examples
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/tools/test-examples/Cargo.lock
+/xtask/Cargo.lock
 **/target/
 **/*.rs.bk
 **/*~
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.1.0"
 edition = "2018"
 
 [workspace]
-exclude = ["./tools"]
+exclude = ["./xtask"]
 
 [[bin]]
 name = "main"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "test-examples"
+name = "xtask"
 version = "0.0.0"
 edition = "2018"
 publish = false
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -26,7 +26,18 @@ use std::time::Instant;
 use std::{env, f64, fs};
 
 #[derive(StructOpt, Debug)]
-struct Opt {
+#[structopt(bin_name("cargo"))]
+enum Opt {
+    Xtask(OptXtask),
+}
+
+#[derive(StructOpt, Debug)]
+enum OptXtask {
+    TestExamples(OptXtaskTestExamples),
+}
+
+#[derive(StructOpt, Debug)]
+struct OptXtaskTestExamples {
     #[structopt(
         long,
         value_name("PATH"),
@@ -37,7 +48,7 @@ struct Opt {
 }
 
 fn main() -> anyhow::Result<()> {
-    let Opt { config } = Opt::from_args();
+    let Opt::Xtask(OptXtask::TestExamples(OptXtaskTestExamples { config })) = Opt::from_args();
 
     env_logger::builder()
         .format(|buf, record| {
@@ -60,7 +71,7 @@ fn main() -> anyhow::Result<()> {
             write_with_style(Color::Black, false, true, "]")?;
             writeln!(buf, " {}", record.args())
         })
-        .filter_module("test_examples", LevelFilter::Info)
+        .filter_module("xtask", LevelFilter::Info)
         .init();
 
     let config = read_toml::<_, Config>(config)?;
@@ -134,7 +145,8 @@ fn scrape_sample_cases(config: &Config) -> anyhow::Result<()> {
 }
 
 fn get_html(url: &Url) -> anyhow::Result<Html> {
-    static USER_AGENT: &str = "test-examples <https://github.com/rust-lang-ja/atcoder-rust-base>";
+    static USER_AGENT: &str =
+        "atcoder-rust-base <https://github.com/rust-lang-ja/atcoder-rust-base>";
 
     info!("GET: {}", url);
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[alias]`
`2`		`-test-examples = ["run", "--manifest-path", "./tools/test-examples/Cargo.toml", "--"]`
	`2`	`+xtask = ["run", "--manifest-path", "./xtask/Cargo.toml", "--", "xtask"]`