diff --git a/Cargo.lock b/Cargo.lock index d2986a8fc60..8f3466ac6f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,6 +71,15 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +[[package]] +name = "anstyle-lossy" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a0444767dbd4aea9355cb47a370eb184dbfe918875e127eff52cb9d1638181" +dependencies = [ + "anstyle", +] + [[package]] name = "anstyle-parse" version = "0.2.3" @@ -89,6 +98,19 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "anstyle-svg" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6ddad447b448d6d5db36b31cbd3ff27c7af071619501998eeceab01968287a" +dependencies = [ + "anstream", + "anstyle", + "anstyle-lossy", + "html-escape", + "unicode-width", +] + [[package]] name = "anstyle-wincon" version = "3.0.2" @@ -1913,6 +1935,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + [[package]] name = "http-auth" version = "0.1.9" @@ -3132,17 +3163,19 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snapbox" -version = "0.5.0" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8269b717f21b142c0377f1e617e80999e3ef6b1c010959b44fd93320722d2cba" +checksum = "06c5d3f53d7d2d3c2679d4a46fdbc738cf554e6d13a1c0b2c42ed170c92d73af" dependencies = [ "anstream", "anstyle", + "anstyle-svg", "content_inspector", "dunce", "escargot", "filetime", "normalize-line-endings", + "serde_json", "similar", "snapbox-macros", "tempfile", @@ -3530,6 +3563,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + [[package]] name = "utf8parse" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 2727786fb1f..8fa5d553fac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ sha1 = "0.10.6" sha2 = "0.10.8" shell-escape = "0.1.5" supports-hyperlinks = "2.1.0" -snapbox = { version = "0.5.0", features = ["diff", "path"] } +snapbox = { version = "0.5.6", features = ["diff", "path", "term-svg"] } tar = { version = "0.4.40", default-features = false } tempfile = "3.9.0" thiserror = "1.0.56" diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index 2755d7335e0..8a2e97b2fac 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -1326,6 +1326,7 @@ impl CargoCommand for snapbox::cmd::Command { fn cargo_ui() -> Self { Self::new(cargo_exe()) .with_assert(compare::assert_ui()) + .env("CARGO_TERM_COLOR", "always") .test_env() } } diff --git a/tests/testsuite/cargo/help/mod.rs b/tests/testsuite/cargo/help/mod.rs index e1ea0ae4174..d6c2b9c2a90 100644 --- a/tests/testsuite/cargo/help/mod.rs +++ b/tests/testsuite/cargo/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo/help/stdout.log b/tests/testsuite/cargo/help/stdout.log deleted file mode 100644 index e4b28056401..00000000000 --- a/tests/testsuite/cargo/help/stdout.log +++ /dev/null @@ -1,40 +0,0 @@ -Rust's package manager - -Usage: cargo [..][OPTIONS] [COMMAND] - cargo [..][OPTIONS] -Zscript [ARGS]... - -Options: - -V, --version Print version info and exit - --list List installed commands - --explain Provide a detailed explanation of a rustc error message - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - -C Change to DIRECTORY before doing anything (nightly-only) - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Commands: - build, b Compile the current package - check, c Analyze the current package and report errors, but don't build object files - clean Remove the target directory - doc, d Build this package's and its dependencies' documentation - new Create a new cargo package - init Create a new cargo package in an existing directory - add Add dependencies to a manifest file - remove Remove dependencies from a manifest file - run, r Run a binary or example of the local package - test, t Run the tests - bench Run the benchmarks - update Update dependencies listed in Cargo.lock - search Search registry for crates - publish Package and upload this package to the registry - install Install a Rust binary - uninstall Uninstall a Rust binary - ... See all commands with --list - -See 'cargo help ' for more information on a specific command. diff --git a/tests/testsuite/cargo/help/stdout.term.svg b/tests/testsuite/cargo/help/stdout.term.svg new file mode 100644 index 00000000000..7ed181e4f30 --- /dev/null +++ b/tests/testsuite/cargo/help/stdout.term.svg @@ -0,0 +1,106 @@ + + + + + + + Rust's package manager + + + + Usage: cargo [+toolchain] [OPTIONS] [COMMAND] + + cargo [+toolchain] [OPTIONS] -Zscript <MANIFEST_RS> [ARGS]... + + + + Options: + + -V, --version Print version info and exit + + --list List installed commands + + --explain <CODE> Provide a detailed explanation of a rustc error message + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + -C <DIRECTORY> Change to DIRECTORY before doing anything (nightly-only) + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Commands: + + build, b Compile the current package + + check, c Analyze the current package and report errors, but don't build object files + + clean Remove the target directory + + doc, d Build this package's and its dependencies' documentation + + new Create a new cargo package + + init Create a new cargo package in an existing directory + + add Add dependencies to a manifest file + + remove Remove dependencies from a manifest file + + run, r Run a binary or example of the local package + + test, t Run the tests + + bench Run the benchmarks + + update Update dependencies listed in Cargo.lock + + search Search registry for crates + + publish Package and upload this package to the registry + + install Install a Rust binary + + uninstall Uninstall a Rust binary + + ... See all commands with --list + + + + See 'cargo help <command>' for more information on a specific command. + + + + + + diff --git a/tests/testsuite/cargo/z_help/mod.rs b/tests/testsuite/cargo/z_help/mod.rs index 8c7b2668fcd..05e91b81bfd 100644 --- a/tests/testsuite/cargo/z_help/mod.rs +++ b/tests/testsuite/cargo/z_help/mod.rs @@ -9,6 +9,6 @@ fn case() { .args(["-Z", "help"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo/z_help/stdout.log b/tests/testsuite/cargo/z_help/stdout.log deleted file mode 100644 index 2a4703cc11f..00000000000 --- a/tests/testsuite/cargo/z_help/stdout.log +++ /dev/null @@ -1,38 +0,0 @@ -Available unstable (nightly-only) flags: - - -Z allow-features Allow *only* the listed unstable features - -Z asymmetric-token Allows authenticating with asymmetric tokens - -Z avoid-dev-deps Avoid installing dev-dependencies if possible - -Z binary-dep-depinfo Track changes to dependency artifacts - -Z bindeps Allow Cargo packages to depend on bin, cdylib, and staticlib crates, and use the artifacts built by those crates - -Z build-std Enable Cargo to compile the standard library itself as part of a crate graph compilation - -Z build-std-features Configure features enabled for the standard library itself when building the standard library - -Z check-cfg Enable compile-time checking of `cfg` names/values/features - -Z codegen-backend Enable the `codegen-backend` option in profiles in .cargo/config.toml file - -Z config-include Enable the `include` key in config files - -Z direct-minimal-versions Resolve minimal dependency versions instead of maximum (direct dependencies only) - -Z doctest-xcompile Compile and run doctests for non-host target using runner config - -Z dual-proc-macros Build proc-macros for both the host and the target - -Z gc Track cache usage and "garbage collect" unused files - -Z git Enable support for shallow git fetch operations - -Z gitoxide Use gitoxide for the given git interactions, or all of them if no argument is given - -Z host-config Enable the `[host]` section in the .cargo/config.toml file - -Z lints Pass `[lints]` to the linting tools - -Z minimal-versions Resolve minimal dependency versions instead of maximum - -Z msrv-policy Enable rust-version aware policy within cargo - -Z mtime-on-use Configure Cargo to update the mtime of used files - -Z no-index-update Do not update the registry index even if the cache is outdated - -Z panic-abort-tests Enable support to run tests with -Cpanic=abort - -Z precise-pre-release Enable pre-release versions to be selected with `update --precise` - -Z profile-rustflags Enable the `rustflags` option in profiles in .cargo/config.toml file - -Z publish-timeout Enable the `publish.timeout` key in .cargo/config.toml file - -Z rustdoc-map Allow passing external documentation mappings to rustdoc - -Z rustdoc-scrape-examples Allows Rustdoc to scrape code examples from reverse-dependencies - -Z script Enable support for single-file, `.rs` packages - -Z target-applies-to-host Enable the `target-applies-to-host` key in the .cargo/config.toml file - -Z trim-paths Enable the `trim-paths` option in profiles - -Z unstable-options Allow the usage of unstable options - -Run with `cargo -Z [FLAG] [COMMAND]` - -See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html for more information about these flags. diff --git a/tests/testsuite/cargo/z_help/stdout.term.svg b/tests/testsuite/cargo/z_help/stdout.term.svg new file mode 100644 index 00000000000..ced211b9259 --- /dev/null +++ b/tests/testsuite/cargo/z_help/stdout.term.svg @@ -0,0 +1,102 @@ + + + + + + + Available unstable (nightly-only) flags: + + + + -Z allow-features Allow *only* the listed unstable features + + -Z asymmetric-token Allows authenticating with asymmetric tokens + + -Z avoid-dev-deps Avoid installing dev-dependencies if possible + + -Z binary-dep-depinfo Track changes to dependency artifacts + + -Z bindeps Allow Cargo packages to depend on bin, cdylib, and staticlib crates, and use the artifacts built by those crates + + -Z build-std Enable Cargo to compile the standard library itself as part of a crate graph compilation + + -Z build-std-features Configure features enabled for the standard library itself when building the standard library + + -Z check-cfg Enable compile-time checking of `cfg` names/values/features + + -Z codegen-backend Enable the `codegen-backend` option in profiles in .cargo/config.toml file + + -Z config-include Enable the `include` key in config files + + -Z direct-minimal-versions Resolve minimal dependency versions instead of maximum (direct dependencies only) + + -Z doctest-xcompile Compile and run doctests for non-host target using runner config + + -Z dual-proc-macros Build proc-macros for both the host and the target + + -Z gc Track cache usage and "garbage collect" unused files + + -Z git Enable support for shallow git fetch operations + + -Z gitoxide Use gitoxide for the given git interactions, or all of them if no argument is given + + -Z host-config Enable the `[host]` section in the .cargo/config.toml file + + -Z lints Pass `[lints]` to the linting tools + + -Z minimal-versions Resolve minimal dependency versions instead of maximum + + -Z msrv-policy Enable rust-version aware policy within cargo + + -Z mtime-on-use Configure Cargo to update the mtime of used files + + -Z no-index-update Do not update the registry index even if the cache is outdated + + -Z panic-abort-tests Enable support to run tests with -Cpanic=abort + + -Z precise-pre-release Enable pre-release versions to be selected with `update --precise` + + -Z profile-rustflags Enable the `rustflags` option in profiles in .cargo/config.toml file + + -Z publish-timeout Enable the `publish.timeout` key in .cargo/config.toml file + + -Z rustdoc-map Allow passing external documentation mappings to rustdoc + + -Z rustdoc-scrape-examples Allows Rustdoc to scrape code examples from reverse-dependencies + + -Z script Enable support for single-file, `.rs` packages + + -Z target-applies-to-host Enable the `target-applies-to-host` key in the .cargo/config.toml file + + -Z trim-paths Enable the `trim-paths` option in profiles + + -Z unstable-options Allow the usage of unstable options + + + + Run with `cargo -Z [FLAG] [COMMAND]` + + + + See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html for more information about these flags. + + + + + + diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs index 1e8c7dde2c2..f78d8555b30 100644 --- a/tests/testsuite/cargo_add/add_basic/mod.rs +++ b/tests/testsuite/cargo_add/add_basic/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_basic/stderr.log b/tests/testsuite/cargo_add/add_basic/stderr.log deleted file mode 100644 index f8621cd26c2..00000000000 --- a/tests/testsuite/cargo_add/add_basic/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/add_basic/stderr.term.svg b/tests/testsuite/cargo_add/add_basic/stderr.term.svg new file mode 100644 index 00000000000..67da0f3dbfd --- /dev/null +++ b/tests/testsuite/cargo_add/add_basic/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs index cab3b4e4eaa..89fb234e44f 100644 --- a/tests/testsuite/cargo_add/add_multiple/mod.rs +++ b/tests/testsuite/cargo_add/add_multiple/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_multiple/stderr.log b/tests/testsuite/cargo_add/add_multiple/stderr.log deleted file mode 100644 index becee3f5584..00000000000 --- a/tests/testsuite/cargo_add/add_multiple/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/add_multiple/stderr.term.svg b/tests/testsuite/cargo_add/add_multiple/stderr.term.svg new file mode 100644 index 00000000000..2bb3cad83b3 --- /dev/null +++ b/tests/testsuite/cargo_add/add_multiple/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs index e4efa7b610d..74b3186018a 100644 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs +++ b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -28,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(str![""]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.log b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.log deleted file mode 100644 index 004713758cc..00000000000 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.log +++ /dev/null @@ -1,11 +0,0 @@ - Updating `alternative` index -warning: translating `linked_hash_map` to `linked-hash-map` - Adding linked-hash-map v0.5.4 to dependencies - Features: - - clippy - - heapsize - - heapsize_impl - - nightly - - serde - - serde_impl - - serde_test diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg new file mode 100644 index 00000000000..c26ae4b456a --- /dev/null +++ b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg @@ -0,0 +1,49 @@ + + + + + + + Updating `alternative` index + + warning: translating `linked_hash_map` to `linked-hash-map` + + Adding linked-hash-map v0.5.4 to dependencies + + Features: + + - clippy + + - heapsize + + - heapsize_impl + + - nightly + + - serde + + - serde_impl + + - serde_test + + + + + + diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stdout.log b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs index e3ef32f9d63..392a53d6165 100644 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs +++ b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -16,8 +17,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(str![""]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.log b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.log deleted file mode 100644 index fbe4bffe918..00000000000 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: the crate `cbindgen` could not be found in registry index. diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.term.svg b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.term.svg new file mode 100644 index 00000000000..13189fd5cf6 --- /dev/null +++ b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: the crate `cbindgen` could not be found in registry index. + + + + + + diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stdout.log b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs index bf5c57922f1..b6a5d0ab4e0 100644 --- a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs +++ b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs @@ -36,7 +36,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stderr.log b/tests/testsuite/cargo_add/add_normalized_name_external/stderr.log deleted file mode 100644 index c233efa0ae4..00000000000 --- a/tests/testsuite/cargo_add/add_normalized_name_external/stderr.log +++ /dev/null @@ -1,18 +0,0 @@ - Updating `dummy-registry` index -warning: translating `linked_hash_map` to `linked-hash-map` -warning: translating `Inflector` to `inflector` - Adding linked-hash-map v0.5.4 to dependencies - Features: - - clippy - - heapsize - - heapsize_impl - - nightly - - serde - - serde_impl - - serde_test - Adding inflector v0.11.4 to dependencies - Features: - + heavyweight - + lazy_static - + regex - - unstable diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg b/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg new file mode 100644 index 00000000000..0aedd578769 --- /dev/null +++ b/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg @@ -0,0 +1,63 @@ + + + + + + + Updating `dummy-registry` index + + warning: translating `linked_hash_map` to `linked-hash-map` + + warning: translating `Inflector` to `inflector` + + Adding linked-hash-map v0.5.4 to dependencies + + Features: + + - clippy + + - heapsize + + - heapsize_impl + + - nightly + + - serde + + - serde_impl + + - serde_test + + Adding inflector v0.11.4 to dependencies + + Features: + + + heavyweight + + + lazy_static + + + regex + + - unstable + + + + + + diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs index 6b8aaf1855c..531f2bb0471 100644 --- a/tests/testsuite/cargo_add/add_toolchain/mod.rs +++ b/tests/testsuite/cargo_add/add_toolchain/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_toolchain/stderr.log b/tests/testsuite/cargo_add/add_toolchain/stderr.log deleted file mode 100644 index 0593685adaa..00000000000 --- a/tests/testsuite/cargo_add/add_toolchain/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ -error: invalid character `+` in dependency name: `+nightly` - Use `cargo +nightly add` if you meant to use the `nightly` toolchain. diff --git a/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg b/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg new file mode 100644 index 00000000000..b28a8f36402 --- /dev/null +++ b/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + error: invalid character `+` in dependency name: `+nightly` + + Use `cargo +nightly add` if you meant to use the `nightly` toolchain. + + + + + + diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs index 2635db0d8b7..53addf2b6a9 100644 --- a/tests/testsuite/cargo_add/build/mod.rs +++ b/tests/testsuite/cargo_add/build/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/build/stderr.log b/tests/testsuite/cargo_add/build/stderr.log deleted file mode 100644 index bbb11440249..00000000000 --- a/tests/testsuite/cargo_add/build/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-build-package1 v99999.0.0 to build-dependencies - Adding my-build-package2 v99999.0.0 to build-dependencies diff --git a/tests/testsuite/cargo_add/build/stderr.term.svg b/tests/testsuite/cargo_add/build/stderr.term.svg new file mode 100644 index 00000000000..902c1ba141b --- /dev/null +++ b/tests/testsuite/cargo_add/build/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-build-package1 v99999.0.0 to build-dependencies + + Adding my-build-package2 v99999.0.0 to build-dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs index 7d8d4118a12..1f8d54bf611 100644 --- a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs +++ b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log b/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log deleted file mode 100644 index b8c8c9e3f1b..00000000000 --- a/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to build-dependencies - Features: - - one - - two diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg b/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg new file mode 100644 index 00000000000..5fe418377f1 --- /dev/null +++ b/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to build-dependencies + + Features: + + - one + + - two + + + + + + diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs index 563b1099715..d0046fa57a1 100644 --- a/tests/testsuite/cargo_add/change_rename_target/mod.rs +++ b/tests/testsuite/cargo_add/change_rename_target/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/change_rename_target/stderr.log b/tests/testsuite/cargo_add/change_rename_target/stderr.log deleted file mode 100644 index b7d817604db..00000000000 --- a/tests/testsuite/cargo_add/change_rename_target/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package2 v99999.0.0 to optional dependencies - Adding feature `some-package` diff --git a/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg b/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg new file mode 100644 index 00000000000..f3d77221e0b --- /dev/null +++ b/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package2 v99999.0.0 to optional dependencies + + Adding feature `some-package` + + + + + + diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs index d2d1642742e..7a4befb3579 100644 --- a/tests/testsuite/cargo_add/cyclic_features/mod.rs +++ b/tests/testsuite/cargo_add/cyclic_features/mod.rs @@ -25,7 +25,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/cyclic_features/stderr.log b/tests/testsuite/cargo_add/cyclic_features/stderr.log deleted file mode 100644 index 8e398bc2269..00000000000 --- a/tests/testsuite/cargo_add/cyclic_features/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating `dummy-registry` index - Adding test_cyclic_features v0.1.1 to dependencies - Features: - + feature-one - + feature-two diff --git a/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg b/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg new file mode 100644 index 00000000000..52adc71d970 --- /dev/null +++ b/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg @@ -0,0 +1,35 @@ + + + + + + + Updating `dummy-registry` index + + Adding test_cyclic_features v0.1.1 to dependencies + + Features: + + + feature-one + + + feature-two + + + + + + diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs index b05f081e3a4..b81fcba3908 100644 --- a/tests/testsuite/cargo_add/default_features/mod.rs +++ b/tests/testsuite/cargo_add/default_features/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/default_features/stderr.log b/tests/testsuite/cargo_add/default_features/stderr.log deleted file mode 100644 index 0fb065ebda1..00000000000 --- a/tests/testsuite/cargo_add/default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/default_features/stderr.term.svg b/tests/testsuite/cargo_add/default_features/stderr.term.svg new file mode 100644 index 00000000000..c887461f55e --- /dev/null +++ b/tests/testsuite/cargo_add/default_features/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs index 55f0434e9b1..ed80f3f4c8c 100644 --- a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs +++ b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stderr.log b/tests/testsuite/cargo_add/deprecated_default_features/stderr.log deleted file mode 100644 index 46d99d15def..00000000000 --- a/tests/testsuite/cargo_add/deprecated_default_features/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: Use of `default_features` in `my-package` is unsupported, please switch to `default-features` diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg b/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg new file mode 100644 index 00000000000..a4f9f6c993f --- /dev/null +++ b/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: Use of `default_features` in `my-package` is unsupported, please switch to `default-features` + + + + + + diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs index 55f0434e9b1..ed80f3f4c8c 100644 --- a/tests/testsuite/cargo_add/deprecated_section/mod.rs +++ b/tests/testsuite/cargo_add/deprecated_section/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/deprecated_section/stderr.log b/tests/testsuite/cargo_add/deprecated_section/stderr.log deleted file mode 100644 index b3b9c10f9b9..00000000000 --- a/tests/testsuite/cargo_add/deprecated_section/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: Deprecated dependency sections are unsupported: dev_dependencies, build_dependencies diff --git a/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg b/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg new file mode 100644 index 00000000000..98a67b97235 --- /dev/null +++ b/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: Deprecated dependency sections are unsupported: dev_dependencies, build_dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs index cdaac6b9b18..45af7d6212a 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.log deleted file mode 100644 index d8922c24dcd..00000000000 --- a/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding foo (workspace) to dependencies diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg new file mode 100644 index 00000000000..890a67bc986 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding foo (workspace) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs index d2df34c2d02..6af2684be56 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.log deleted file mode 100644 index 6c3a6ed1da3..00000000000 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ - Adding foo (workspace) to dependencies - Features as of v0.0.0: - + default-base - + default-merge-base - + default-test-base - + merge - + merge-base - + test - + test-base - - unrelated diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.term.svg new file mode 100644 index 00000000000..99c2be36353 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.term.svg @@ -0,0 +1,46 @@ + + + + + + + Adding foo (workspace) to dependencies + + Features as of v0.0.0: + + + default-base + + + default-merge-base + + + default-test-base + + + merge + + + merge-base + + + test + + + test-base + + - unrelated + + + + + + diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs index 501d4dfe634..de880db7d9d 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log deleted file mode 100644 index ac16f38d5c8..00000000000 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding foo (workspace) to optional dependencies - Adding feature `foo` diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg new file mode 100644 index 00000000000..c8ef4f9c980 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Adding foo (workspace) to optional dependencies + + Adding feature `foo` + + + + + + diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs index c474ffdc05d..e7b1413ffa5 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.log deleted file mode 100644 index a3ec5a046d0..00000000000 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding foo (workspace) to public dependencies diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg new file mode 100644 index 00000000000..170ace3143c --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding foo (workspace) to public dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs index bd395ef72e6..6c96ecd2282 100644 --- a/tests/testsuite/cargo_add/dev/mod.rs +++ b/tests/testsuite/cargo_add/dev/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev/stderr.log b/tests/testsuite/cargo_add/dev/stderr.log deleted file mode 100644 index d75e23a7fbe..00000000000 --- a/tests/testsuite/cargo_add/dev/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-dev-package1 v99999.0.0 to dev-dependencies - Adding my-dev-package2 v99999.0.0 to dev-dependencies diff --git a/tests/testsuite/cargo_add/dev/stderr.term.svg b/tests/testsuite/cargo_add/dev/stderr.term.svg new file mode 100644 index 00000000000..c3aa5e272df --- /dev/null +++ b/tests/testsuite/cargo_add/dev/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-dev-package1 v99999.0.0 to dev-dependencies + + Adding my-dev-package2 v99999.0.0 to dev-dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs index bf672e61a84..36026645a39 100644 --- a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs +++ b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev_build_conflict/stderr.log b/tests/testsuite/cargo_add/dev_build_conflict/stderr.log deleted file mode 100644 index 69c52091292..00000000000 --- a/tests/testsuite/cargo_add/dev_build_conflict/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: the argument '--dev' cannot be used with '--build' - -Usage: cargo add [OPTIONS] [@] ... - cargo add [OPTIONS] --path ... - cargo add [OPTIONS] --git ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_add/dev_build_conflict/stderr.term.svg b/tests/testsuite/cargo_add/dev_build_conflict/stderr.term.svg new file mode 100644 index 00000000000..4dc6b251532 --- /dev/null +++ b/tests/testsuite/cargo_add/dev_build_conflict/stderr.term.svg @@ -0,0 +1,42 @@ + + + + + + + error: the argument '--dev' cannot be used with '--build' + + + + Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ... + + cargo add [OPTIONS] --path <PATH> ... + + cargo add [OPTIONS] --git <URL> ... + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs index 46ebd2cf542..6376004b664 100644 --- a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs +++ b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.log b/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.log deleted file mode 100644 index 6de56a0c8e0..00000000000 --- a/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dev-dependencies - Features as of v0.0.0: - - one - - two diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg b/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg new file mode 100644 index 00000000000..f4cc3c835d2 --- /dev/null +++ b/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to dev-dependencies + + Features as of v0.0.0: + + - one + + - two + + + + + + diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs index 0100bc47a71..e50c668331d 100644 --- a/tests/testsuite/cargo_add/dry_run/mod.rs +++ b/tests/testsuite/cargo_add/dry_run/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dry_run/stderr.log b/tests/testsuite/cargo_add/dry_run/stderr.log deleted file mode 100644 index d662386c0ca..00000000000 --- a/tests/testsuite/cargo_add/dry_run/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies -warning: aborting add due to dry run diff --git a/tests/testsuite/cargo_add/dry_run/stderr.term.svg b/tests/testsuite/cargo_add/dry_run/stderr.term.svg new file mode 100644 index 00000000000..476f48b8212 --- /dev/null +++ b/tests/testsuite/cargo_add/dry_run/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + warning: aborting add due to dry run + + + + + + diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs index 545ecd2dae7..51f0af3b2d2 100644 --- a/tests/testsuite/cargo_add/empty_dep_name/mod.rs +++ b/tests/testsuite/cargo_add/empty_dep_name/mod.rs @@ -19,7 +19,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/empty_dep_name/stderr.log b/tests/testsuite/cargo_add/empty_dep_name/stderr.log deleted file mode 100644 index d9547a42acf..00000000000 --- a/tests/testsuite/cargo_add/empty_dep_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: package name cannot be empty diff --git a/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg b/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg new file mode 100644 index 00000000000..710039d4322 --- /dev/null +++ b/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: package name cannot be empty + + + + + + diff --git a/tests/testsuite/cargo_add/empty_dep_table/mod.rs b/tests/testsuite/cargo_add/empty_dep_table/mod.rs index 10675dd2f5e..3f4fff3dc44 100644 --- a/tests/testsuite/cargo_add/empty_dep_table/mod.rs +++ b/tests/testsuite/cargo_add/empty_dep_table/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/empty_dep_table/stderr.log b/tests/testsuite/cargo_add/empty_dep_table/stderr.log deleted file mode 100644 index 3acd7b944ec..00000000000 --- a/tests/testsuite/cargo_add/empty_dep_table/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: unrecognized dependency source for `your-face`, expected a local path, Git repository, version, or workspace dependency to be specified diff --git a/tests/testsuite/cargo_add/empty_dep_table/stderr.term.svg b/tests/testsuite/cargo_add/empty_dep_table/stderr.term.svg new file mode 100644 index 00000000000..6b077ea4366 --- /dev/null +++ b/tests/testsuite/cargo_add/empty_dep_table/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: unrecognized dependency source for `your-face`, expected a local path, Git repository, version, or workspace dependency to be specified + + + + + + diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs index 79155d0facd..973015f2b13 100644 --- a/tests/testsuite/cargo_add/features/mod.rs +++ b/tests/testsuite/cargo_add/features/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features/stderr.log b/tests/testsuite/cargo_add/features/stderr.log deleted file mode 100644 index 6fa70b32747..00000000000 --- a/tests/testsuite/cargo_add/features/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - - ears - - mouth - - nose diff --git a/tests/testsuite/cargo_add/features/stderr.term.svg b/tests/testsuite/cargo_add/features/stderr.term.svg new file mode 100644 index 00000000000..4fc7b73b917 --- /dev/null +++ b/tests/testsuite/cargo_add/features/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + - ears + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs index 31ba1cdcbd8..51345c7b53f 100644 --- a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs +++ b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stderr.log b/tests/testsuite/cargo_add/features_activated_over_limit/stderr.log deleted file mode 100644 index 460d5f9fa0d..00000000000 --- a/tests/testsuite/cargo_add/features_activated_over_limit/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - 100 activated features - 100 deactivated features diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg b/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg new file mode 100644 index 00000000000..e025fff42f9 --- /dev/null +++ b/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg @@ -0,0 +1,35 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + 100 activated features + + 100 deactivated features + + + + + + diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs index 2cf3aab6782..6a15f085e7b 100644 --- a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs +++ b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.log b/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.log deleted file mode 100644 index 8a8914106a3..00000000000 --- a/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.log +++ /dev/null @@ -1,34 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes000 - + eyes001 - + eyes002 - + eyes003 - + eyes004 - + eyes005 - + eyes006 - + eyes007 - + eyes008 - + eyes009 - + eyes010 - + eyes011 - + eyes012 - + eyes013 - + eyes014 - + eyes015 - + eyes016 - + eyes017 - + eyes018 - + eyes019 - + eyes020 - + eyes021 - + eyes022 - + eyes023 - + eyes024 - + eyes025 - + eyes026 - + eyes027 - + eyes028 - + eyes029 - 170 deactivated features diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg b/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg new file mode 100644 index 00000000000..7ddd85f65a3 --- /dev/null +++ b/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg @@ -0,0 +1,93 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes000 + + + eyes001 + + + eyes002 + + + eyes003 + + + eyes004 + + + eyes005 + + + eyes006 + + + eyes007 + + + eyes008 + + + eyes009 + + + eyes010 + + + eyes011 + + + eyes012 + + + eyes013 + + + eyes014 + + + eyes015 + + + eyes016 + + + eyes017 + + + eyes018 + + + eyes019 + + + eyes020 + + + eyes021 + + + eyes022 + + + eyes023 + + + eyes024 + + + eyes025 + + + eyes026 + + + eyes027 + + + eyes028 + + + eyes029 + + 170 deactivated features + + + + + + diff --git a/tests/testsuite/cargo_add/features_empty/mod.rs b/tests/testsuite/cargo_add/features_empty/mod.rs index 7434bad89df..0ef080fcdee 100644 --- a/tests/testsuite/cargo_add/features_empty/mod.rs +++ b/tests/testsuite/cargo_add/features_empty/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_empty/stderr.log b/tests/testsuite/cargo_add/features_empty/stderr.log deleted file mode 100644 index 025651f187e..00000000000 --- a/tests/testsuite/cargo_add/features_empty/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/features_empty/stderr.term.svg b/tests/testsuite/cargo_add/features_empty/stderr.term.svg new file mode 100644 index 00000000000..810a3d4fc86 --- /dev/null +++ b/tests/testsuite/cargo_add/features_empty/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs index a5a66680ecc..cc48e49b306 100644 --- a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs +++ b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.log b/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.log deleted file mode 100644 index 01cd9229750..00000000000 --- a/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - + nose - - ears - - mouth diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg b/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg new file mode 100644 index 00000000000..87e0d51d1b8 --- /dev/null +++ b/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + + nose + + - ears + + - mouth + + + + + + diff --git a/tests/testsuite/cargo_add/features_preserve/mod.rs b/tests/testsuite/cargo_add/features_preserve/mod.rs index b9f3eb61b08..b5b8ae962cf 100644 --- a/tests/testsuite/cargo_add/features_preserve/mod.rs +++ b/tests/testsuite/cargo_add/features_preserve/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_preserve/stderr.log b/tests/testsuite/cargo_add/features_preserve/stderr.log deleted file mode 100644 index 6fa70b32747..00000000000 --- a/tests/testsuite/cargo_add/features_preserve/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - - ears - - mouth - - nose diff --git a/tests/testsuite/cargo_add/features_preserve/stderr.term.svg b/tests/testsuite/cargo_add/features_preserve/stderr.term.svg new file mode 100644 index 00000000000..4fc7b73b917 --- /dev/null +++ b/tests/testsuite/cargo_add/features_preserve/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + - ears + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/features_spaced_values/mod.rs b/tests/testsuite/cargo_add/features_spaced_values/mod.rs index d1520a1b240..ea7e56acd32 100644 --- a/tests/testsuite/cargo_add/features_spaced_values/mod.rs +++ b/tests/testsuite/cargo_add/features_spaced_values/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_spaced_values/stderr.log b/tests/testsuite/cargo_add/features_spaced_values/stderr.log deleted file mode 100644 index 01cd9229750..00000000000 --- a/tests/testsuite/cargo_add/features_spaced_values/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - + nose - - ears - - mouth diff --git a/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg b/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg new file mode 100644 index 00000000000..87e0d51d1b8 --- /dev/null +++ b/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + + nose + + - ears + + - mouth + + + + + + diff --git a/tests/testsuite/cargo_add/features_unknown/mod.rs b/tests/testsuite/cargo_add/features_unknown/mod.rs index d29f0514c37..8f5e2b68aca 100644 --- a/tests/testsuite/cargo_add/features_unknown/mod.rs +++ b/tests/testsuite/cargo_add/features_unknown/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_unknown/stderr.log b/tests/testsuite/cargo_add/features_unknown/stderr.log deleted file mode 100644 index 9715153280e..00000000000 --- a/tests/testsuite/cargo_add/features_unknown/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies -error: unrecognized feature for crate your-face: noze -disabled features: - ears, eyes, mouth, nose diff --git a/tests/testsuite/cargo_add/features_unknown/stderr.term.svg b/tests/testsuite/cargo_add/features_unknown/stderr.term.svg new file mode 100644 index 00000000000..045e9dc9aad --- /dev/null +++ b/tests/testsuite/cargo_add/features_unknown/stderr.term.svg @@ -0,0 +1,36 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + error: unrecognized feature for crate your-face: noze + + disabled features: + + ears, eyes, mouth, nose + + + + + + diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs index c3b8ca1187f..1fe2f77ba2c 100644 --- a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs +++ b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/stderr.log b/tests/testsuite/cargo_add/features_unknown_no_features/stderr.log deleted file mode 100644 index 7564fec9822..00000000000 --- a/tests/testsuite/cargo_add/features_unknown_no_features/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies -error: unrecognized feature for crate my-package: noze -no features available for crate my-package diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg b/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg new file mode 100644 index 00000000000..8501383964c --- /dev/null +++ b/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + error: unrecognized feature for crate my-package: noze + + no features available for crate my-package + + + + + + diff --git a/tests/testsuite/cargo_add/git/mod.rs b/tests/testsuite/cargo_add/git/mod.rs index 7460071a24d..648d6346ab3 100644 --- a/tests/testsuite/cargo_add/git/mod.rs +++ b/tests/testsuite/cargo_add/git/mod.rs @@ -29,7 +29,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git/stderr.log b/tests/testsuite/cargo_add/git/stderr.log deleted file mode 100644 index 386ccb01bf9..00000000000 --- a/tests/testsuite/cargo_add/git/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git/stderr.term.svg b/tests/testsuite/cargo_add/git/stderr.term.svg new file mode 100644 index 00000000000..3b12dd9ef53 --- /dev/null +++ b/tests/testsuite/cargo_add/git/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git_branch/mod.rs b/tests/testsuite/cargo_add/git_branch/mod.rs index 46f00a7d96b..cdb68e087f5 100644 --- a/tests/testsuite/cargo_add/git_branch/mod.rs +++ b/tests/testsuite/cargo_add/git_branch/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_branch/stderr.log b/tests/testsuite/cargo_add/git_branch/stderr.log deleted file mode 100644 index 386ccb01bf9..00000000000 --- a/tests/testsuite/cargo_add/git_branch/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_branch/stderr.term.svg b/tests/testsuite/cargo_add/git_branch/stderr.term.svg new file mode 100644 index 00000000000..3b12dd9ef53 --- /dev/null +++ b/tests/testsuite/cargo_add/git_branch/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs index 515b6645820..b2a65eec12a 100644 --- a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs +++ b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs @@ -35,7 +35,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/stderr.log b/tests/testsuite/cargo_add/git_conflicts_namever/stderr.log deleted file mode 100644 index 207e0ded3a7..00000000000 --- a/tests/testsuite/cargo_add/git_conflicts_namever/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot specify a git URL (`https://github.com/dcjanus/invalid`) with a version (`0.4.3`). diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg b/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg new file mode 100644 index 00000000000..543d07dc245 --- /dev/null +++ b/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: cannot specify a git URL (`https://github.com/dcjanus/invalid`) with a version (`0.4.3`). + + + + + + diff --git a/tests/testsuite/cargo_add/git_dev/mod.rs b/tests/testsuite/cargo_add/git_dev/mod.rs index 2ad6a11e111..902ba92a095 100644 --- a/tests/testsuite/cargo_add/git_dev/mod.rs +++ b/tests/testsuite/cargo_add/git_dev/mod.rs @@ -29,7 +29,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_dev/stderr.log b/tests/testsuite/cargo_add/git_dev/stderr.log deleted file mode 100644 index 11912112b02..00000000000 --- a/tests/testsuite/cargo_add/git_dev/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dev-dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_dev/stderr.term.svg b/tests/testsuite/cargo_add/git_dev/stderr.term.svg new file mode 100644 index 00000000000..fd23e9a77bc --- /dev/null +++ b/tests/testsuite/cargo_add/git_dev/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dev-dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git_inferred_name/mod.rs b/tests/testsuite/cargo_add/git_inferred_name/mod.rs index ec2ae613c70..78b29bf727b 100644 --- a/tests/testsuite/cargo_add/git_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/git_inferred_name/mod.rs @@ -29,7 +29,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_inferred_name/stderr.log b/tests/testsuite/cargo_add/git_inferred_name/stderr.log deleted file mode 100644 index a1136292680..00000000000 --- a/tests/testsuite/cargo_add/git_inferred_name/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg b/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg new file mode 100644 index 00000000000..49ec565777f --- /dev/null +++ b/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs index 5da681c0741..00cc82af4bb 100644 --- a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs +++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs @@ -69,7 +69,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.log b/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.log deleted file mode 100644 index 2e045db6f2c..00000000000 --- a/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` -error: multiple packages found at `[ROOTURL]/git-package`: - my-package1, my-package2, my-package3, my-package4, my-package5, my-package6 - my-package7, my-package8, my-package9 -To disambiguate, run `cargo add --git [ROOTURL]/git-package ` diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg b/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg new file mode 100644 index 00000000000..466f7993d46 --- /dev/null +++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg @@ -0,0 +1,36 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + error: multiple packages found at `[ROOTURL]/git-package`: + + my-package1, my-package2, my-package3, my-package4, my-package5, my-package6 + + my-package7, my-package8, my-package9 + + To disambiguate, run `cargo add --git [ROOTURL]/git-package <package>` + + + + + + diff --git a/tests/testsuite/cargo_add/git_multiple_names/mod.rs b/tests/testsuite/cargo_add/git_multiple_names/mod.rs index 2bf2668aafb..addd9aa7df4 100644 --- a/tests/testsuite/cargo_add/git_multiple_names/mod.rs +++ b/tests/testsuite/cargo_add/git_multiple_names/mod.rs @@ -47,7 +47,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_multiple_names/stderr.log b/tests/testsuite/cargo_add/git_multiple_names/stderr.log deleted file mode 100644 index fb6982698c7..00000000000 --- a/tests/testsuite/cargo_add/git_multiple_names/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding my-package1 (git) to dependencies - Adding my-package2 (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg b/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg new file mode 100644 index 00000000000..35504f18754 --- /dev/null +++ b/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding my-package1 (git) to dependencies + + Adding my-package2 (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs index 085c3b9e4d0..1e69342d06c 100644 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs @@ -58,7 +58,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log deleted file mode 100644 index 1004dd77da3..00000000000 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding package-with-feature (git) to dependencies - Features: - + target_feature - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg new file mode 100644 index 00000000000..3cbfd7b0bad --- /dev/null +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg @@ -0,0 +1,35 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding package-with-feature (git) to dependencies + + Features: + + + target_feature + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git_normalized_name/mod.rs b/tests/testsuite/cargo_add/git_normalized_name/mod.rs index bb45065363f..39121322904 100644 --- a/tests/testsuite/cargo_add/git_normalized_name/mod.rs +++ b/tests/testsuite/cargo_add/git_normalized_name/mod.rs @@ -29,7 +29,7 @@ fn case() { .assert() .failure() // Fuzzy searching for paths isn't supported at this time .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_normalized_name/stderr.log b/tests/testsuite/cargo_add/git_normalized_name/stderr.log deleted file mode 100644 index fedf82861c2..00000000000 --- a/tests/testsuite/cargo_add/git_normalized_name/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` -error: the crate `git_package@[ROOTURL]/git-package` could not be found at `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_normalized_name/stderr.term.svg b/tests/testsuite/cargo_add/git_normalized_name/stderr.term.svg new file mode 100644 index 00000000000..8cc5ce688b6 --- /dev/null +++ b/tests/testsuite/cargo_add/git_normalized_name/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + error: the crate `git_package@[ROOTURL]/git-package` could not be found at `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git_registry/mod.rs b/tests/testsuite/cargo_add/git_registry/mod.rs index 638927de2b3..dd5fbce6338 100644 --- a/tests/testsuite/cargo_add/git_registry/mod.rs +++ b/tests/testsuite/cargo_add/git_registry/mod.rs @@ -48,7 +48,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_registry/stderr.log b/tests/testsuite/cargo_add/git_registry/stderr.log deleted file mode 100644 index b9291d08185..00000000000 --- a/tests/testsuite/cargo_add/git_registry/stderr.log +++ /dev/null @@ -1,6 +0,0 @@ - Updating git repository `[ROOTURL]/versioned-package` - Adding versioned-package (git) to dependencies -error: failed to parse manifest at `[ROOT]/case/Cargo.toml` - -Caused by: - dependency (versioned-package) specification is ambiguous. Only one of `git` or `registry` is allowed. diff --git a/tests/testsuite/cargo_add/git_registry/stderr.term.svg b/tests/testsuite/cargo_add/git_registry/stderr.term.svg new file mode 100644 index 00000000000..094b9725ab0 --- /dev/null +++ b/tests/testsuite/cargo_add/git_registry/stderr.term.svg @@ -0,0 +1,38 @@ + + + + + + + Updating git repository `[ROOTURL]/versioned-package` + + Adding versioned-package (git) to dependencies + + error: failed to parse manifest at `[ROOT]/case/Cargo.toml` + + + + Caused by: + + dependency (versioned-package) specification is ambiguous. Only one of `git` or `registry` is allowed. + + + + + + diff --git a/tests/testsuite/cargo_add/git_rev/mod.rs b/tests/testsuite/cargo_add/git_rev/mod.rs index 5104a351d71..89ee40053c0 100644 --- a/tests/testsuite/cargo_add/git_rev/mod.rs +++ b/tests/testsuite/cargo_add/git_rev/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_rev/stderr.log b/tests/testsuite/cargo_add/git_rev/stderr.log deleted file mode 100644 index 386ccb01bf9..00000000000 --- a/tests/testsuite/cargo_add/git_rev/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_rev/stderr.term.svg b/tests/testsuite/cargo_add/git_rev/stderr.term.svg new file mode 100644 index 00000000000..3b12dd9ef53 --- /dev/null +++ b/tests/testsuite/cargo_add/git_rev/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git_tag/mod.rs b/tests/testsuite/cargo_add/git_tag/mod.rs index fcac9731ef9..c486ed19494 100644 --- a/tests/testsuite/cargo_add/git_tag/mod.rs +++ b/tests/testsuite/cargo_add/git_tag/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_tag/stderr.log b/tests/testsuite/cargo_add/git_tag/stderr.log deleted file mode 100644 index 386ccb01bf9..00000000000 --- a/tests/testsuite/cargo_add/git_tag/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_tag/stderr.term.svg b/tests/testsuite/cargo_add/git_tag/stderr.term.svg new file mode 100644 index 00000000000..3b12dd9ef53 --- /dev/null +++ b/tests/testsuite/cargo_add/git_tag/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/help/mod.rs b/tests/testsuite/cargo_add/help/mod.rs index f7a9964abb4..54ed2273750 100644 --- a/tests/testsuite/cargo_add/help/mod.rs +++ b/tests/testsuite/cargo_add/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_add/help/stdout.log b/tests/testsuite/cargo_add/help/stdout.log deleted file mode 100644 index ee738a3e59c..00000000000 --- a/tests/testsuite/cargo_add/help/stdout.log +++ /dev/null @@ -1,135 +0,0 @@ -Add dependencies to a Cargo.toml manifest file - -Usage: cargo add [OPTIONS] [@] ... - cargo add [OPTIONS] --path ... - cargo add [OPTIONS] --git ... - -Arguments: - [DEP_ID]... - Reference to a package to add as a dependency - - You can reference a package by: - - ``, like `cargo add serde` (latest version will be used) - - `@`, like `cargo add serde@1` or `cargo add serde@=1.0.38` - -Options: - --no-default-features - Disable the default features - - --default-features - Re-enable the default features - - -F, --features - Space or comma separated list of features to activate - - --optional - Mark the dependency as optional - - The package name will be exposed as feature of your crate. - - --no-optional - Mark the dependency as required - - The package will be removed from your features. - - --public - Mark the dependency as public (unstable) - - The dependency can be referenced in your library's public API. - - --no-public - Mark the dependency as private (unstable) - - While you can use the crate in your implementation, it cannot be referenced in your public - API. - - --rename - Rename the dependency - - Example uses: - - Depending on multiple versions of a crate - - Depend on crates with the same name from different registries - - --ignore-rust-version - Ignore `rust-version` specification in packages (unstable) - - -n, --dry-run - Don't actually write the manifest - - -v, --verbose... - Use verbose output (-vv very verbose/build.rs output) - - -q, --quiet - Do not print cargo log messages - - --color - Coloring: auto, always, never - - --config - Override a configuration value - - -Z - Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - - -h, --help - Print help (see a summary with '-h') - -Manifest Options: - --manifest-path - Path to Cargo.toml - - --frozen - Require Cargo.lock and cache are up to date - - --locked - Require Cargo.lock is up to date - - --offline - Run without accessing the network - -Package Selection: - -p, --package [] - Package to modify - -Source: - --path - Filesystem path to local crate to add - - --git - Git repository location - - Without any other information, cargo will use latest commit on the main branch. - - --branch - Git branch to download the crate from - - --tag - Git tag to download the crate from - - --rev - Git reference to download the crate from - - This is the catch all, handling hashes to named references in remote repositories. - - --registry - Package registry for this dependency - -Section: - --dev - Add as development dependency - - Dev-dependencies are not used when compiling a package for building, but are used for - compiling tests, examples, and benchmarks. - - These dependencies are not propagated to other packages which depend on this package. - - --build - Add as build dependency - - Build-dependencies are the only dependencies available for use by build scripts - (`build.rs` files). - - --target - Add as dependency to the given target platform - -Run `cargo help add` for more detailed information. diff --git a/tests/testsuite/cargo_add/help/stdout.term.svg b/tests/testsuite/cargo_add/help/stdout.term.svg new file mode 100644 index 00000000000..dab4c43ec71 --- /dev/null +++ b/tests/testsuite/cargo_add/help/stdout.term.svg @@ -0,0 +1,296 @@ + + + + + + + Add dependencies to a Cargo.toml manifest file + + + + Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ... + + cargo add [OPTIONS] --path <PATH> ... + + cargo add [OPTIONS] --git <URL> ... + + + + Arguments: + + [DEP_ID]... + + Reference to a package to add as a dependency + + + + You can reference a package by: + + - `<name>`, like `cargo add serde` (latest version will be used) + + - `<name>@<version-req>`, like `cargo add serde@1` or `cargo add serde@=1.0.38` + + + + Options: + + --no-default-features + + Disable the default features + + + + --default-features + + Re-enable the default features + + + + -F, --features <FEATURES> + + Space or comma separated list of features to activate + + + + --optional + + Mark the dependency as optional + + + + The package name will be exposed as feature of your crate. + + + + --no-optional + + Mark the dependency as required + + + + The package will be removed from your features. + + + + --public + + Mark the dependency as public (unstable) + + + + The dependency can be referenced in your library's public API. + + + + --no-public + + Mark the dependency as private (unstable) + + + + While you can use the crate in your implementation, it cannot be referenced in your public + + API. + + + + --rename <NAME> + + Rename the dependency + + + + Example uses: + + - Depending on multiple versions of a crate + + - Depend on crates with the same name from different registries + + + + --ignore-rust-version + + Ignore `rust-version` specification in packages (unstable) + + + + -n, --dry-run + + Don't actually write the manifest + + + + -v, --verbose... + + Use verbose output (-vv very verbose/build.rs output) + + + + -q, --quiet + + Do not print cargo log messages + + + + --color <WHEN> + + Coloring: auto, always, never + + + + --config <KEY=VALUE> + + Override a configuration value + + + + -Z <FLAG> + + Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + + + -h, --help + + Print help (see a summary with '-h') + + + + Manifest Options: + + --manifest-path <PATH> + + Path to Cargo.toml + + + + --frozen + + Require Cargo.lock and cache are up to date + + + + --locked + + Require Cargo.lock is up to date + + + + --offline + + Run without accessing the network + + + + Package Selection: + + -p, --package [<SPEC>] + + Package to modify + + + + Source: + + --path <PATH> + + Filesystem path to local crate to add + + + + --git <URI> + + Git repository location + + + + Without any other information, cargo will use latest commit on the main branch. + + + + --branch <BRANCH> + + Git branch to download the crate from + + + + --tag <TAG> + + Git tag to download the crate from + + + + --rev <REV> + + Git reference to download the crate from + + + + This is the catch all, handling hashes to named references in remote repositories. + + + + --registry <NAME> + + Package registry for this dependency + + + + Section: + + --dev + + Add as development dependency + + + + Dev-dependencies are not used when compiling a package for building, but are used for + + compiling tests, examples, and benchmarks. + + + + These dependencies are not propagated to other packages which depend on this package. + + + + --build + + Add as build dependency + + + + Build-dependencies are the only dependencies available for use by build scripts + + (`build.rs` files). + + + + --target <TARGET> + + Add as dependency to the given target platform + + + + Run `cargo help add` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_add/infer_prerelease/mod.rs b/tests/testsuite/cargo_add/infer_prerelease/mod.rs index b51be512596..86c445a54af 100644 --- a/tests/testsuite/cargo_add/infer_prerelease/mod.rs +++ b/tests/testsuite/cargo_add/infer_prerelease/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/infer_prerelease/stderr.log b/tests/testsuite/cargo_add/infer_prerelease/stderr.log deleted file mode 100644 index cf7ff16e6ca..00000000000 --- a/tests/testsuite/cargo_add/infer_prerelease/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding prerelease_only v0.2.0-alpha.1 to dependencies diff --git a/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg b/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg new file mode 100644 index 00000000000..027707e042c --- /dev/null +++ b/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding prerelease_only v0.2.0-alpha.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_arg/mod.rs b/tests/testsuite/cargo_add/invalid_arg/mod.rs index 9aa5be32792..021936e40ee 100644 --- a/tests/testsuite/cargo_add/invalid_arg/mod.rs +++ b/tests/testsuite/cargo_add/invalid_arg/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_arg/stderr.log b/tests/testsuite/cargo_add/invalid_arg/stderr.log deleted file mode 100644 index 96d067ed1fd..00000000000 --- a/tests/testsuite/cargo_add/invalid_arg/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ -error: unexpected argument '--flag' found - - tip: a similar argument exists: '--tag' - -Usage: cargo add [OPTIONS] [@] ... - cargo add [OPTIONS] --path ... - cargo add [OPTIONS] --git ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_add/invalid_arg/stderr.term.svg b/tests/testsuite/cargo_add/invalid_arg/stderr.term.svg new file mode 100644 index 00000000000..82d236ae48b --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_arg/stderr.term.svg @@ -0,0 +1,46 @@ + + + + + + + error: unexpected argument '--flag' found + + + + tip: a similar argument exists: '--tag' + + + + Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ... + + cargo add [OPTIONS] --path <PATH> ... + + cargo add [OPTIONS] --git <URL> ... + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_git_name/mod.rs b/tests/testsuite/cargo_add/invalid_git_name/mod.rs index bf3dd1c292e..3aa1c52afc2 100644 --- a/tests/testsuite/cargo_add/invalid_git_name/mod.rs +++ b/tests/testsuite/cargo_add/invalid_git_name/mod.rs @@ -29,7 +29,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_git_name/stderr.log b/tests/testsuite/cargo_add/invalid_git_name/stderr.log deleted file mode 100644 index 68fc4e49d77..00000000000 --- a/tests/testsuite/cargo_add/invalid_git_name/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` -error: the crate `not-in-git@[ROOTURL]/git-package` could not be found at `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/invalid_git_name/stderr.term.svg b/tests/testsuite/cargo_add/invalid_git_name/stderr.term.svg new file mode 100644 index 00000000000..fc52c27e381 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_git_name/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Updating git repository `[ROOTURL]/git-package` + + error: the crate `not-in-git@[ROOTURL]/git-package` could not be found at `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs index d4a5f4bbfc9..6f8a77ca45a 100644 --- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs +++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.log b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.log deleted file mode 100644 index 85bd8da0a82..00000000000 --- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot override workspace dependency with `--default-features`, either change `workspace.dependencies.foo.default-features` or define the dependency exclusively in the package's manifest diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.term.svg b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.term.svg new file mode 100644 index 00000000000..84b42a908b0 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: cannot override workspace dependency with `--default-features`, either change `workspace.dependencies.foo.default-features` or define the dependency exclusively in the package's manifest + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs index d4a5f4bbfc9..6f8a77ca45a 100644 --- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs +++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.log b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.log deleted file mode 100644 index 85bd8da0a82..00000000000 --- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot override workspace dependency with `--default-features`, either change `workspace.dependencies.foo.default-features` or define the dependency exclusively in the package's manifest diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.term.svg b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.term.svg new file mode 100644 index 00000000000..84b42a908b0 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: cannot override workspace dependency with `--default-features`, either change `workspace.dependencies.foo.default-features` or define the dependency exclusively in the package's manifest + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs index 2b34aeda2fc..b28c269f3b0 100644 --- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs +++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.log b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.log deleted file mode 100644 index 35bcdb6946b..00000000000 --- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot override workspace dependency with `--rename`, either change `workspace.dependencies.foo.package` or define the dependency exclusively in the package's manifest diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.term.svg b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.term.svg new file mode 100644 index 00000000000..d2fb7db39b8 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: cannot override workspace dependency with `--rename`, either change `workspace.dependencies.foo.package` or define the dependency exclusively in the package's manifest + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_manifest/mod.rs b/tests/testsuite/cargo_add/invalid_manifest/mod.rs index bbcbce39701..fcb7096e8a6 100644 --- a/tests/testsuite/cargo_add/invalid_manifest/mod.rs +++ b/tests/testsuite/cargo_add/invalid_manifest/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_manifest/stderr.log b/tests/testsuite/cargo_add/invalid_manifest/stderr.log deleted file mode 100644 index 47684f599f0..00000000000 --- a/tests/testsuite/cargo_add/invalid_manifest/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: invalid string -expected `"`, `'` - --> Cargo.toml:8:7 - | -8 | key = invalid-value - | ^ - | diff --git a/tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg b/tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg new file mode 100644 index 00000000000..a7f889b5983 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + error: invalid string + + expected `"`, `'` + + --> Cargo.toml:8:7 + + | + + 8 | key = invalid-value + + | ^ + + | + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_name_external/mod.rs b/tests/testsuite/cargo_add/invalid_name_external/mod.rs index 1213ce51ea9..192e3349867 100644 --- a/tests/testsuite/cargo_add/invalid_name_external/mod.rs +++ b/tests/testsuite/cargo_add/invalid_name_external/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_name_external/stderr.log b/tests/testsuite/cargo_add/invalid_name_external/stderr.log deleted file mode 100644 index 5e574cedad0..00000000000 --- a/tests/testsuite/cargo_add/invalid_name_external/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index -error: the crate `lets_hope_nobody_ever_publishes_this_crate` could not be found in registry index. diff --git a/tests/testsuite/cargo_add/invalid_name_external/stderr.term.svg b/tests/testsuite/cargo_add/invalid_name_external/stderr.term.svg new file mode 100644 index 00000000000..0ebce172089 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_name_external/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Updating `dummy-registry` index + + error: the crate `lets_hope_nobody_ever_publishes_this_crate` could not be found in registry index. + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_path/mod.rs b/tests/testsuite/cargo_add/invalid_path/mod.rs index c22bbb4b8a4..88e8838e02b 100644 --- a/tests/testsuite/cargo_add/invalid_path/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path/stderr.log b/tests/testsuite/cargo_add/invalid_path/stderr.log deleted file mode 100644 index f6c40433062..00000000000 --- a/tests/testsuite/cargo_add/invalid_path/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ -error: failed to load source for dependency `cargo-list-test-fixture` - -Caused by: - Unable to update [ROOT]/case/tests/fixtures/local - -Caused by: - failed to read `[ROOT]/case/tests/fixtures/local/Cargo.toml` - -Caused by: - [..] diff --git a/tests/testsuite/cargo_add/invalid_path/stderr.term.svg b/tests/testsuite/cargo_add/invalid_path/stderr.term.svg new file mode 100644 index 00000000000..2c332b98a20 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path/stderr.term.svg @@ -0,0 +1,45 @@ + + + + + + + error: failed to load source for dependency `cargo-list-test-fixture` + + + + Caused by: + + Unable to update [ROOT]/case/tests/fixtures/local + + + + Caused by: + + failed to read `[ROOT]/case/tests/fixtures/local/Cargo.toml` + + + + Caused by: + + [..] + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_path_name/mod.rs b/tests/testsuite/cargo_add/invalid_path_name/mod.rs index 8b28bde7e2b..ea7d1fd6921 100644 --- a/tests/testsuite/cargo_add/invalid_path_name/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path_name/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path_name/stderr.log b/tests/testsuite/cargo_add/invalid_path_name/stderr.log deleted file mode 100644 index b35ea823377..00000000000 --- a/tests/testsuite/cargo_add/invalid_path_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: the crate `not-at-path@[ROOT]/case/dependency` could not be found at `[ROOT]/case/dependency` diff --git a/tests/testsuite/cargo_add/invalid_path_name/stderr.term.svg b/tests/testsuite/cargo_add/invalid_path_name/stderr.term.svg new file mode 100644 index 00000000000..4f64a904173 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path_name/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: the crate `not-at-path@[ROOT]/case/dependency` could not be found at `[ROOT]/case/dependency` + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_path_self/mod.rs b/tests/testsuite/cargo_add/invalid_path_self/mod.rs index 5f088a48e82..47d031d8727 100644 --- a/tests/testsuite/cargo_add/invalid_path_self/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path_self/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path_self/stderr.log b/tests/testsuite/cargo_add/invalid_path_self/stderr.log deleted file mode 100644 index ba22c5e1586..00000000000 --- a/tests/testsuite/cargo_add/invalid_path_self/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding cargo-list-test-fixture (local) to dependencies -error: cannot add `cargo-list-test-fixture` as a dependency to itself diff --git a/tests/testsuite/cargo_add/invalid_path_self/stderr.term.svg b/tests/testsuite/cargo_add/invalid_path_self/stderr.term.svg new file mode 100644 index 00000000000..6ad6a900b7f --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path_self/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Adding cargo-list-test-fixture (local) to dependencies + + error: cannot add `cargo-list-test-fixture` as a dependency to itself + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs index 35c1eb5d49b..52b3baceacb 100644 --- a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs +++ b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_target_empty/stderr.log b/tests/testsuite/cargo_add/invalid_target_empty/stderr.log deleted file mode 100644 index 4b1a2c3154b..00000000000 --- a/tests/testsuite/cargo_add/invalid_target_empty/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ -error: a value is required for '--target ' but none was supplied - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_add/invalid_target_empty/stderr.term.svg b/tests/testsuite/cargo_add/invalid_target_empty/stderr.term.svg new file mode 100644 index 00000000000..7179275cc79 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_target_empty/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + error: a value is required for '--target <TARGET>' but none was supplied + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_vers/mod.rs b/tests/testsuite/cargo_add/invalid_vers/mod.rs index 019dbbeedd2..2e88c2d3b4d 100644 --- a/tests/testsuite/cargo_add/invalid_vers/mod.rs +++ b/tests/testsuite/cargo_add/invalid_vers/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_vers/stderr.log b/tests/testsuite/cargo_add/invalid_vers/stderr.log deleted file mode 100644 index 64f908eac66..00000000000 --- a/tests/testsuite/cargo_add/invalid_vers/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ -error: invalid version requirement `invalid-version-string` - -Caused by: - unexpected character 'i' while parsing major version number diff --git a/tests/testsuite/cargo_add/invalid_vers/stderr.term.svg b/tests/testsuite/cargo_add/invalid_vers/stderr.term.svg new file mode 100644 index 00000000000..44c8a962683 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_vers/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + error: invalid version requirement `invalid-version-string` + + + + Caused by: + + unexpected character 'i' while parsing major version number + + + + + + diff --git a/tests/testsuite/cargo_add/list_features/mod.rs b/tests/testsuite/cargo_add/list_features/mod.rs index d882ec8be76..714d016d5e0 100644 --- a/tests/testsuite/cargo_add/list_features/mod.rs +++ b/tests/testsuite/cargo_add/list_features/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features/stderr.log b/tests/testsuite/cargo_add/list_features/stderr.log deleted file mode 100644 index 025651f187e..00000000000 --- a/tests/testsuite/cargo_add/list_features/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/list_features/stderr.term.svg b/tests/testsuite/cargo_add/list_features/stderr.term.svg new file mode 100644 index 00000000000..810a3d4fc86 --- /dev/null +++ b/tests/testsuite/cargo_add/list_features/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/list_features_path/mod.rs b/tests/testsuite/cargo_add/list_features_path/mod.rs index 722ef8bed01..c2d4421a8b7 100644 --- a/tests/testsuite/cargo_add/list_features_path/mod.rs +++ b/tests/testsuite/cargo_add/list_features_path/mod.rs @@ -37,7 +37,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features_path/stderr.log b/tests/testsuite/cargo_add/list_features_path/stderr.log deleted file mode 100644 index 7b32a9df6e7..00000000000 --- a/tests/testsuite/cargo_add/list_features_path/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Adding your-face (local) to dependencies - Features: - + mouth - + nose - - eyes - - optional-dependency - Updating `dummy-registry` index diff --git a/tests/testsuite/cargo_add/list_features_path/stderr.term.svg b/tests/testsuite/cargo_add/list_features_path/stderr.term.svg new file mode 100644 index 00000000000..f7364f62efe --- /dev/null +++ b/tests/testsuite/cargo_add/list_features_path/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Adding your-face (local) to dependencies + + Features: + + + mouth + + + nose + + - eyes + + - optional-dependency + + Updating `dummy-registry` index + + + + + + diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs b/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs index a961259abbc..ad88ceb67d1 100644 --- a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs +++ b/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs @@ -42,7 +42,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.log b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.log deleted file mode 100644 index 483ca153cd2..00000000000 --- a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Adding your-face (local) to dependencies - Features: - - eyes - - mouth - - nose - - optional-dependency - Updating `dummy-registry` index diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg new file mode 100644 index 00000000000..cbea08aca8e --- /dev/null +++ b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Adding your-face (local) to dependencies + + Features: + + - eyes + + - mouth + + - nose + + - optional-dependency + + Updating `dummy-registry` index + + + + + + diff --git a/tests/testsuite/cargo_add/locked_changed/mod.rs b/tests/testsuite/cargo_add/locked_changed/mod.rs index f4dce4ac6f2..04a367bd469 100644 --- a/tests/testsuite/cargo_add/locked_changed/mod.rs +++ b/tests/testsuite/cargo_add/locked_changed/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/locked_changed/stderr.log b/tests/testsuite/cargo_add/locked_changed/stderr.log deleted file mode 100644 index ca42c0419bf..00000000000 --- a/tests/testsuite/cargo_add/locked_changed/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies -error: the manifest file [ROOT]/case/Cargo.toml needs to be updated but --locked was passed to prevent this diff --git a/tests/testsuite/cargo_add/locked_changed/stderr.term.svg b/tests/testsuite/cargo_add/locked_changed/stderr.term.svg new file mode 100644 index 00000000000..dd3e844e376 --- /dev/null +++ b/tests/testsuite/cargo_add/locked_changed/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + error: the manifest file [ROOT]/case/Cargo.toml needs to be updated but --locked was passed to prevent this + + + + + + diff --git a/tests/testsuite/cargo_add/locked_unchanged/mod.rs b/tests/testsuite/cargo_add/locked_unchanged/mod.rs index 94a4dc3dc78..932c008bb38 100644 --- a/tests/testsuite/cargo_add/locked_unchanged/mod.rs +++ b/tests/testsuite/cargo_add/locked_unchanged/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/locked_unchanged/stderr.log b/tests/testsuite/cargo_add/locked_unchanged/stderr.log deleted file mode 100644 index f8621cd26c2..00000000000 --- a/tests/testsuite/cargo_add/locked_unchanged/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/locked_unchanged/stderr.term.svg b/tests/testsuite/cargo_add/locked_unchanged/stderr.term.svg new file mode 100644 index 00000000000..67da0f3dbfd --- /dev/null +++ b/tests/testsuite/cargo_add/locked_unchanged/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/lockfile_updated/mod.rs b/tests/testsuite/cargo_add/lockfile_updated/mod.rs index 3036e4330cd..151f49b38f1 100644 --- a/tests/testsuite/cargo_add/lockfile_updated/mod.rs +++ b/tests/testsuite/cargo_add/lockfile_updated/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/lockfile_updated/stderr.log b/tests/testsuite/cargo_add/lockfile_updated/stderr.log deleted file mode 100644 index f8621cd26c2..00000000000 --- a/tests/testsuite/cargo_add/lockfile_updated/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/lockfile_updated/stderr.term.svg b/tests/testsuite/cargo_add/lockfile_updated/stderr.term.svg new file mode 100644 index 00000000000..67da0f3dbfd --- /dev/null +++ b/tests/testsuite/cargo_add/lockfile_updated/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/manifest_path_package/mod.rs b/tests/testsuite/cargo_add/manifest_path_package/mod.rs index a8380e52961..6c6a7677ff3 100644 --- a/tests/testsuite/cargo_add/manifest_path_package/mod.rs +++ b/tests/testsuite/cargo_add/manifest_path_package/mod.rs @@ -38,7 +38,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/manifest_path_package/stderr.log b/tests/testsuite/cargo_add/manifest_path_package/stderr.log deleted file mode 100644 index c98958c63df..00000000000 --- a/tests/testsuite/cargo_add/manifest_path_package/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg b/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg new file mode 100644 index 00000000000..298799cea86 --- /dev/null +++ b/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs index 0e742a9199b..c99b7087942 100644 --- a/tests/testsuite/cargo_add/merge_activated_features/mod.rs +++ b/tests/testsuite/cargo_add/merge_activated_features/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/merge_activated_features/stderr.log b/tests/testsuite/cargo_add/merge_activated_features/stderr.log deleted file mode 100644 index 6c3a6ed1da3..00000000000 --- a/tests/testsuite/cargo_add/merge_activated_features/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ - Adding foo (workspace) to dependencies - Features as of v0.0.0: - + default-base - + default-merge-base - + default-test-base - + merge - + merge-base - + test - + test-base - - unrelated diff --git a/tests/testsuite/cargo_add/merge_activated_features/stderr.term.svg b/tests/testsuite/cargo_add/merge_activated_features/stderr.term.svg new file mode 100644 index 00000000000..99c2be36353 --- /dev/null +++ b/tests/testsuite/cargo_add/merge_activated_features/stderr.term.svg @@ -0,0 +1,46 @@ + + + + + + + Adding foo (workspace) to dependencies + + Features as of v0.0.0: + + + default-base + + + default-merge-base + + + default-test-base + + + merge + + + merge-base + + + test + + + test-base + + - unrelated + + + + + + diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs index ba4a00d0947..932549177ef 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs @@ -37,7 +37,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log deleted file mode 100644 index 72fd9fc9d4a..00000000000 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: feature `nose` must be qualified by the dependency it's being activated for, like `my-package1/nose`, `your-face/nose` diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.term.svg b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.term.svg new file mode 100644 index 00000000000..f7692fa9c55 --- /dev/null +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: feature `nose` must be qualified by the dependency it's being activated for, like `my-package1/nose`, `your-face/nose` + + + + + + diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs index b574b747ad3..6328ae731ca 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.log b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.log deleted file mode 100644 index e83250e7389..00000000000 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot specify multiple crates with `--rename` diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.term.svg b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.term.svg new file mode 100644 index 00000000000..62ff9d8420f --- /dev/null +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: cannot specify multiple crates with `--rename` + + + + + + diff --git a/tests/testsuite/cargo_add/namever/mod.rs b/tests/testsuite/cargo_add/namever/mod.rs index bc86ac22212..ac916da2f8c 100644 --- a/tests/testsuite/cargo_add/namever/mod.rs +++ b/tests/testsuite/cargo_add/namever/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/namever/stderr.log b/tests/testsuite/cargo_add/namever/stderr.log deleted file mode 100644 index 1aea8e1f773..00000000000 --- a/tests/testsuite/cargo_add/namever/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 >=0.1.1 to dependencies - Adding my-package2 v0.2.3 to dependencies - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/namever/stderr.term.svg b/tests/testsuite/cargo_add/namever/stderr.term.svg new file mode 100644 index 00000000000..77c6e765fa7 --- /dev/null +++ b/tests/testsuite/cargo_add/namever/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 >=0.1.1 to dependencies + + Adding my-package2 v0.2.3 to dependencies + + Adding my-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/no_args/mod.rs b/tests/testsuite/cargo_add/no_args/mod.rs index 76960ab3c93..2b69d5db639 100644 --- a/tests/testsuite/cargo_add/no_args/mod.rs +++ b/tests/testsuite/cargo_add/no_args/mod.rs @@ -19,7 +19,7 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_args/stderr.log b/tests/testsuite/cargo_add/no_args/stderr.log deleted file mode 100644 index 0274950a5f8..00000000000 --- a/tests/testsuite/cargo_add/no_args/stderr.log +++ /dev/null @@ -1,8 +0,0 @@ -error: the following required arguments were not provided: - |--git > - -Usage: cargo add [OPTIONS] [@] ... - cargo add [OPTIONS] --path ... - cargo add [OPTIONS] --git ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_add/no_args/stderr.term.svg b/tests/testsuite/cargo_add/no_args/stderr.term.svg new file mode 100644 index 00000000000..8fb358ee4fe --- /dev/null +++ b/tests/testsuite/cargo_add/no_args/stderr.term.svg @@ -0,0 +1,43 @@ + + + + + + + error: the following required arguments were not provided: + + <DEP_ID|--path <PATH>|--git <URI>> + + + + Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ... + + cargo add [OPTIONS] --path <PATH> ... + + cargo add [OPTIONS] --git <URL> ... + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_add/no_default_features/mod.rs b/tests/testsuite/cargo_add/no_default_features/mod.rs index 6e982a17bed..6eadbf7ee05 100644 --- a/tests/testsuite/cargo_add/no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/no_default_features/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_default_features/stderr.log b/tests/testsuite/cargo_add/no_default_features/stderr.log deleted file mode 100644 index 0fb065ebda1..00000000000 --- a/tests/testsuite/cargo_add/no_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/no_default_features/stderr.term.svg new file mode 100644 index 00000000000..c887461f55e --- /dev/null +++ b/tests/testsuite/cargo_add/no_default_features/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/no_optional/mod.rs b/tests/testsuite/cargo_add/no_optional/mod.rs index bc7a1bffe79..3a07f0b51b4 100644 --- a/tests/testsuite/cargo_add/no_optional/mod.rs +++ b/tests/testsuite/cargo_add/no_optional/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_optional/stderr.log b/tests/testsuite/cargo_add/no_optional/stderr.log deleted file mode 100644 index c6dee405bb4..00000000000 --- a/tests/testsuite/cargo_add/no_optional/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/no_optional/stderr.term.svg b/tests/testsuite/cargo_add/no_optional/stderr.term.svg new file mode 100644 index 00000000000..5fa97ef17aa --- /dev/null +++ b/tests/testsuite/cargo_add/no_optional/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/no_public/mod.rs b/tests/testsuite/cargo_add/no_public/mod.rs index 5c63934a74b..2c6c832d490 100644 --- a/tests/testsuite/cargo_add/no_public/mod.rs +++ b/tests/testsuite/cargo_add/no_public/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_public/stderr.log b/tests/testsuite/cargo_add/no_public/stderr.log deleted file mode 100644 index c6dee405bb4..00000000000 --- a/tests/testsuite/cargo_add/no_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/no_public/stderr.term.svg b/tests/testsuite/cargo_add/no_public/stderr.term.svg new file mode 100644 index 00000000000..5fa97ef17aa --- /dev/null +++ b/tests/testsuite/cargo_add/no_public/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs index 9c50a7993e2..299f5ae82d8 100644 --- a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs +++ b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/offline_empty_cache/stderr.log b/tests/testsuite/cargo_add/offline_empty_cache/stderr.log deleted file mode 100644 index e0260b79515..00000000000 --- a/tests/testsuite/cargo_add/offline_empty_cache/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: the crate `my-package` could not be found in registry index. diff --git a/tests/testsuite/cargo_add/offline_empty_cache/stderr.term.svg b/tests/testsuite/cargo_add/offline_empty_cache/stderr.term.svg new file mode 100644 index 00000000000..a93311cb687 --- /dev/null +++ b/tests/testsuite/cargo_add/offline_empty_cache/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: the crate `my-package` could not be found in registry index. + + + + + + diff --git a/tests/testsuite/cargo_add/optional/mod.rs b/tests/testsuite/cargo_add/optional/mod.rs index 33c41808021..29f0e94226f 100644 --- a/tests/testsuite/cargo_add/optional/mod.rs +++ b/tests/testsuite/cargo_add/optional/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/optional/stderr.log b/tests/testsuite/cargo_add/optional/stderr.log deleted file mode 100644 index baa1ab663a0..00000000000 --- a/tests/testsuite/cargo_add/optional/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to optional dependencies - Adding feature `my-package` diff --git a/tests/testsuite/cargo_add/optional/stderr.term.svg b/tests/testsuite/cargo_add/optional/stderr.term.svg new file mode 100644 index 00000000000..5bef51cee7b --- /dev/null +++ b/tests/testsuite/cargo_add/optional/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to optional dependencies + + Adding feature `my-package` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs index b05f081e3a4..b81fcba3908 100644 --- a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_default_features/stderr.log b/tests/testsuite/cargo_add/overwrite_default_features/stderr.log deleted file mode 100644 index 0fb065ebda1..00000000000 --- a/tests/testsuite/cargo_add/overwrite_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg new file mode 100644 index 00000000000..c887461f55e --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs index 6e982a17bed..6eadbf7ee05 100644 --- a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.log b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.log deleted file mode 100644 index 0fb065ebda1..00000000000 --- a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg new file mode 100644 index 00000000000..c887461f55e --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_features/mod.rs b/tests/testsuite/cargo_add/overwrite_features/mod.rs index 7f9437b97a9..614036dee66 100644 --- a/tests/testsuite/cargo_add/overwrite_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_features/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_features/stderr.log b/tests/testsuite/cargo_add/overwrite_features/stderr.log deleted file mode 100644 index 01cd9229750..00000000000 --- a/tests/testsuite/cargo_add/overwrite_features/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - + nose - - ears - - mouth diff --git a/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg new file mode 100644 index 00000000000..87e0d51d1b8 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + + nose + + - ears + + - mouth + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs index a702d3d49fc..1a5952f4a75 100644 --- a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log deleted file mode 100644 index 0ddf581407f..00000000000 --- a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to optional dependencies - Adding feature `cargo-list-test-fixture-dependency` diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg new file mode 100644 index 00000000000..7498f965f7a --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to optional dependencies + + Adding feature `cargo-list-test-fixture-dependency` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs index cdaac6b9b18..45af7d6212a 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.log deleted file mode 100644 index f8e63215194..00000000000 --- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Adding foo (workspace) to dependencies - Features as of v0.0.0: - + test diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg new file mode 100644 index 00000000000..9d470ccc0fe --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Adding foo (workspace) to dependencies + + Features as of v0.0.0: + + + test + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs index cdaac6b9b18..45af7d6212a 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.log deleted file mode 100644 index d8922c24dcd..00000000000 --- a/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding foo (workspace) to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg new file mode 100644 index 00000000000..890a67bc986 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding foo (workspace) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs index cdaac6b9b18..45af7d6212a 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log deleted file mode 100644 index ac16f38d5c8..00000000000 --- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding foo (workspace) to optional dependencies - Adding feature `foo` diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.term.svg new file mode 100644 index 00000000000..c8ef4f9c980 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Adding foo (workspace) to optional dependencies + + Adding feature `foo` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs index fab4998749d..2ca83475ced 100644 --- a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs @@ -39,7 +39,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/stderr.log b/tests/testsuite/cargo_add/overwrite_inline_features/stderr.log deleted file mode 100644 index 3d129b4be64..00000000000 --- a/tests/testsuite/cargo_add/overwrite_inline_features/stderr.log +++ /dev/null @@ -1,8 +0,0 @@ - Updating `dummy-registry` index - Adding unrelateed-crate v99999.0.0 to dependencies - Adding your-face v99999.0.0 to dependencies - Features: - + ears - + eyes - + mouth - + nose diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg new file mode 100644 index 00000000000..a11b9c9d754 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg @@ -0,0 +1,41 @@ + + + + + + + Updating `dummy-registry` index + + Adding unrelateed-crate v99999.0.0 to dependencies + + Adding your-face v99999.0.0 to dependencies + + Features: + + + ears + + + eyes + + + mouth + + + nose + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs index 783bace0fb2..cdff7fa1902 100644 --- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs @@ -27,7 +27,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.log deleted file mode 100644 index ef93a48849f..00000000000 --- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Adding your-face (local) to dev-dependencies - Features: - + mouth - + nose diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg new file mode 100644 index 00000000000..7930b891d02 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Adding your-face (local) to dev-dependencies + + Features: + + + mouth + + + nose + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs index 611c5feeee1..3291e556b23 100644 --- a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs @@ -27,7 +27,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.log deleted file mode 100644 index 3630edc3e5e..00000000000 --- a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Adding your-face (local) to optional dependencies - Features: - + mouth - + nose - Adding feature `your-face` diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg new file mode 100644 index 00000000000..4c7652bb09a --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg @@ -0,0 +1,35 @@ + + + + + + + Adding your-face (local) to optional dependencies + + Features: + + + mouth + + + nose + + Adding feature `your-face` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs index 6e982a17bed..6eadbf7ee05 100644 --- a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.log b/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.log deleted file mode 100644 index 0fb065ebda1..00000000000 --- a/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg new file mode 100644 index 00000000000..c887461f55e --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs index b05f081e3a4..b81fcba3908 100644 --- a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.log b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.log deleted file mode 100644 index 0fb065ebda1..00000000000 --- a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg new file mode 100644 index 00000000000..c887461f55e --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs index bc7a1bffe79..3a07f0b51b4 100644 --- a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_no_optional/stderr.log deleted file mode 100644 index c6dee405bb4..00000000000 --- a/tests/testsuite/cargo_add/overwrite_no_optional/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg new file mode 100644 index 00000000000..5fa97ef17aa --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs index 33c41808021..29f0e94226f 100644 --- a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log deleted file mode 100644 index baa1ab663a0..00000000000 --- a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to optional dependencies - Adding feature `my-package` diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg new file mode 100644 index 00000000000..5bef51cee7b --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to optional dependencies + + Adding feature `my-package` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs index 5c63934a74b..2c6c832d490 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_public/stderr.log b/tests/testsuite/cargo_add/overwrite_no_public/stderr.log deleted file mode 100644 index c6dee405bb4..00000000000 --- a/tests/testsuite/cargo_add/overwrite_no_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg new file mode 100644 index 00000000000..5fa97ef17aa --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs index adeb436061a..3ca92cdc2fb 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.log b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.log deleted file mode 100644 index 92d46fb0972..00000000000 --- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to public dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg new file mode 100644 index 00000000000..78414f295d6 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to public dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional/mod.rs index 33c41808021..29f0e94226f 100644 --- a/tests/testsuite/cargo_add/overwrite_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_optional/stderr.log deleted file mode 100644 index baa1ab663a0..00000000000 --- a/tests/testsuite/cargo_add/overwrite_optional/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to optional dependencies - Adding feature `my-package` diff --git a/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg new file mode 100644 index 00000000000..5bef51cee7b --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to optional dependencies + + Adding feature `my-package` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs index de5a7276649..a17d7d19b07 100644 --- a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs @@ -27,7 +27,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log deleted file mode 100644 index 025651f187e..00000000000 --- a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg new file mode 100644 index 00000000000..810a3d4fc86 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs index 4b99a500fa3..03e863bcb42 100644 --- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.log deleted file mode 100644 index 3ab51fa9fa2..00000000000 --- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to optional dependencies diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg new file mode 100644 index 00000000000..61cf7522249 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to optional dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs index 4b0aadd69c2..39de0137460 100644 --- a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs @@ -27,7 +27,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.log deleted file mode 100644 index 3630edc3e5e..00000000000 --- a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Adding your-face (local) to optional dependencies - Features: - + mouth - + nose - Adding feature `your-face` diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg new file mode 100644 index 00000000000..4c7652bb09a --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg @@ -0,0 +1,35 @@ + + + + + + + Adding your-face (local) to optional dependencies + + Features: + + + mouth + + + nose + + Adding feature `your-face` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs index dcaa0a750ee..a192c0dd78d 100644 --- a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log deleted file mode 100644 index 257ed488714..00000000000 --- a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding cargo-list-test-fixture-dependency v20.0 to optional dependencies - Adding feature `cargo-list-test-fixture-dependency` diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg new file mode 100644 index 00000000000..ada03c5d6f0 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding cargo-list-test-fixture-dependency v20.0 to optional dependencies + + Adding feature `cargo-list-test-fixture-dependency` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs index 7f9437b97a9..614036dee66 100644 --- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.log b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.log deleted file mode 100644 index 01cd9229750..00000000000 --- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - + nose - - ears - - mouth diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg new file mode 100644 index 00000000000..87e0d51d1b8 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + + nose + + - ears + + - mouth + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public/mod.rs index adeb436061a..3ca92cdc2fb 100644 --- a/tests/testsuite/cargo_add/overwrite_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_public/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_public/stderr.log b/tests/testsuite/cargo_add/overwrite_public/stderr.log deleted file mode 100644 index 92d46fb0972..00000000000 --- a/tests/testsuite/cargo_add/overwrite_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to public dependencies diff --git a/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg new file mode 100644 index 00000000000..78414f295d6 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to public dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs index 5c63934a74b..2c6c832d490 100644 --- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.log b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.log deleted file mode 100644 index c6dee405bb4..00000000000 --- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg new file mode 100644 index 00000000000..5fa97ef17aa --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs index e508c34db9f..660a241d10e 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.log b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.log deleted file mode 100644 index 86806f8b724..00000000000 --- a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding versioned-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg new file mode 100644 index 00000000000..1a68d7217cf --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding versioned-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs index 40a55ca09a5..4e10ee12d02 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.log deleted file mode 100644 index 86806f8b724..00000000000 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding versioned-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg new file mode 100644 index 00000000000..1a68d7217cf --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding versioned-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs index 42db5cbcc91..82141add198 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log deleted file mode 100644 index ca365a51126..00000000000 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding versioned-package v0.1.1 to optional dependencies - Adding feature `a1` diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg new file mode 100644 index 00000000000..9a3725e8bc3 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding versioned-package v0.1.1 to optional dependencies + + Adding feature `a1` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs index 6203d7dc36e..73d669c021e 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs @@ -40,7 +40,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log deleted file mode 100644 index 4b02f58ae9e..00000000000 --- a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating git repository `[ROOTURL]/versioned-package` - Adding versioned-package (git) to optional dependencies - Adding feature `versioned-package` - Updating git repository `[ROOTURL]/versioned-package` diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg new file mode 100644 index 00000000000..1f5e0404fd4 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Updating git repository `[ROOTURL]/versioned-package` + + Adding versioned-package (git) to optional dependencies + + Adding feature `versioned-package` + + Updating git repository `[ROOTURL]/versioned-package` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs index a702d3d49fc..1a5952f4a75 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log deleted file mode 100644 index 0ddf581407f..00000000000 --- a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to optional dependencies - Adding feature `cargo-list-test-fixture-dependency` diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg new file mode 100644 index 00000000000..7498f965f7a --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to optional dependencies + + Adding feature `cargo-list-test-fixture-dependency` + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs index 7634d1a004e..86922986f2a 100644 --- a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/stderr.log b/tests/testsuite/cargo_add/overwrite_with_rename/stderr.log deleted file mode 100644 index 86806f8b724..00000000000 --- a/tests/testsuite/cargo_add/overwrite_with_rename/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding versioned-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg new file mode 100644 index 00000000000..1a68d7217cf --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding versioned-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs index 085d0c39943..93359ab6be8 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.log b/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.log deleted file mode 100644 index fc8b7bd1b45..00000000000 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding foo (local) to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg new file mode 100644 index 00000000000..4c665536937 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding foo (local) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs index 085d0c39943..93359ab6be8 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.log b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.log deleted file mode 100644 index 7db50231814..00000000000 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ - Adding foo (local) to dependencies - Features: - + default-base - + default-merge-base - + default-test-base - + test - + test-base - - merge - - merge-base - - unrelated diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.term.svg new file mode 100644 index 00000000000..f4cc1b7b74c --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.term.svg @@ -0,0 +1,46 @@ + + + + + + + Adding foo (local) to dependencies + + Features: + + + default-base + + + default-merge-base + + + default-test-base + + + test + + + test-base + + - merge + + - merge-base + + - unrelated + + + + + + diff --git a/tests/testsuite/cargo_add/path/mod.rs b/tests/testsuite/cargo_add/path/mod.rs index a702d3d49fc..1a5952f4a75 100644 --- a/tests/testsuite/cargo_add/path/mod.rs +++ b/tests/testsuite/cargo_add/path/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path/stderr.log b/tests/testsuite/cargo_add/path/stderr.log deleted file mode 100644 index c98958c63df..00000000000 --- a/tests/testsuite/cargo_add/path/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/path/stderr.term.svg b/tests/testsuite/cargo_add/path/stderr.term.svg new file mode 100644 index 00000000000..298799cea86 --- /dev/null +++ b/tests/testsuite/cargo_add/path/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/path_dev/mod.rs b/tests/testsuite/cargo_add/path_dev/mod.rs index dce163829df..5c12f879ffd 100644 --- a/tests/testsuite/cargo_add/path_dev/mod.rs +++ b/tests/testsuite/cargo_add/path_dev/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_dev/stderr.log b/tests/testsuite/cargo_add/path_dev/stderr.log deleted file mode 100644 index a6ffd22940c..00000000000 --- a/tests/testsuite/cargo_add/path_dev/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dev-dependencies diff --git a/tests/testsuite/cargo_add/path_dev/stderr.term.svg b/tests/testsuite/cargo_add/path_dev/stderr.term.svg new file mode 100644 index 00000000000..a09279b9ecf --- /dev/null +++ b/tests/testsuite/cargo_add/path_dev/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to dev-dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/path_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_inferred_name/mod.rs index a702d3d49fc..1a5952f4a75 100644 --- a/tests/testsuite/cargo_add/path_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/path_inferred_name/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_inferred_name/stderr.log b/tests/testsuite/cargo_add/path_inferred_name/stderr.log deleted file mode 100644 index c98958c63df..00000000000 --- a/tests/testsuite/cargo_add/path_inferred_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg b/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg new file mode 100644 index 00000000000..298799cea86 --- /dev/null +++ b/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs index 4cd09be05ac..0bde644c369 100644 --- a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs +++ b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.log b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.log deleted file mode 100644 index 791ca6008e1..00000000000 --- a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: `your-face/nose` is unsupported when inferring the crate name, use `nose` diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.term.svg b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.term.svg new file mode 100644 index 00000000000..d11de1fc230 --- /dev/null +++ b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: `your-face/nose` is unsupported when inferring the crate name, use `nose` + + + + + + diff --git a/tests/testsuite/cargo_add/path_normalized_name/mod.rs b/tests/testsuite/cargo_add/path_normalized_name/mod.rs index 87f44c66eb4..98702f52045 100644 --- a/tests/testsuite/cargo_add/path_normalized_name/mod.rs +++ b/tests/testsuite/cargo_add/path_normalized_name/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .failure() // Fuzzy searching for paths isn't supported at this time .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_normalized_name/stderr.log b/tests/testsuite/cargo_add/path_normalized_name/stderr.log deleted file mode 100644 index 59b35e3c4b1..00000000000 --- a/tests/testsuite/cargo_add/path_normalized_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: the crate `cargo_list_test_fixture_dependency@[ROOT]/case/dependency` could not be found at `[ROOT]/case/dependency` diff --git a/tests/testsuite/cargo_add/path_normalized_name/stderr.term.svg b/tests/testsuite/cargo_add/path_normalized_name/stderr.term.svg new file mode 100644 index 00000000000..46323a2d4ea --- /dev/null +++ b/tests/testsuite/cargo_add/path_normalized_name/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: the crate `cargo_list_test_fixture_dependency@[ROOT]/case/dependency` could not be found at `[ROOT]/case/dependency` + + + + + + diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs index ab946625982..cc60c5d10d5 100644 --- a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs +++ b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.log b/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.log deleted file mode 100644 index 025651f187e..00000000000 --- a/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg b/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg new file mode 100644 index 00000000000..810a3d4fc86 --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/preserve_features_table/mod.rs b/tests/testsuite/cargo_add/preserve_features_table/mod.rs index ab946625982..cc60c5d10d5 100644 --- a/tests/testsuite/cargo_add/preserve_features_table/mod.rs +++ b/tests/testsuite/cargo_add/preserve_features_table/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_features_table/stderr.log b/tests/testsuite/cargo_add/preserve_features_table/stderr.log deleted file mode 100644 index 025651f187e..00000000000 --- a/tests/testsuite/cargo_add/preserve_features_table/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg b/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg new file mode 100644 index 00000000000..810a3d4fc86 --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/preserve_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_sorted/mod.rs index 1a951d69770..40199bb35af 100644 --- a/tests/testsuite/cargo_add/preserve_sorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_sorted/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_sorted/stderr.log b/tests/testsuite/cargo_add/preserve_sorted/stderr.log deleted file mode 100644 index a097e209c17..00000000000 --- a/tests/testsuite/cargo_add/preserve_sorted/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding toml v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg b/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg new file mode 100644 index 00000000000..952b48415de --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding toml v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs index 1a951d69770..40199bb35af 100644 --- a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_unsorted/stderr.log b/tests/testsuite/cargo_add/preserve_unsorted/stderr.log deleted file mode 100644 index a097e209c17..00000000000 --- a/tests/testsuite/cargo_add/preserve_unsorted/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding toml v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg b/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg new file mode 100644 index 00000000000..952b48415de --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding toml v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/public/mod.rs b/tests/testsuite/cargo_add/public/mod.rs index adeb436061a..3ca92cdc2fb 100644 --- a/tests/testsuite/cargo_add/public/mod.rs +++ b/tests/testsuite/cargo_add/public/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/public/stderr.log b/tests/testsuite/cargo_add/public/stderr.log deleted file mode 100644 index 92d46fb0972..00000000000 --- a/tests/testsuite/cargo_add/public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to public dependencies diff --git a/tests/testsuite/cargo_add/public/stderr.term.svg b/tests/testsuite/cargo_add/public/stderr.term.svg new file mode 100644 index 00000000000..78414f295d6 --- /dev/null +++ b/tests/testsuite/cargo_add/public/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to public dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/registry/mod.rs b/tests/testsuite/cargo_add/registry/mod.rs index 85a342b3675..4d019895588 100644 --- a/tests/testsuite/cargo_add/registry/mod.rs +++ b/tests/testsuite/cargo_add/registry/mod.rs @@ -35,7 +35,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/registry/stderr.log b/tests/testsuite/cargo_add/registry/stderr.log deleted file mode 100644 index 881c1f130d1..00000000000 --- a/tests/testsuite/cargo_add/registry/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `alternative` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/registry/stderr.term.svg b/tests/testsuite/cargo_add/registry/stderr.term.svg new file mode 100644 index 00000000000..7c0001443c2 --- /dev/null +++ b/tests/testsuite/cargo_add/registry/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `alternative` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/rename/mod.rs b/tests/testsuite/cargo_add/rename/mod.rs index 77dd2bb5b9a..6492e551b62 100644 --- a/tests/testsuite/cargo_add/rename/mod.rs +++ b/tests/testsuite/cargo_add/rename/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rename/stderr.log b/tests/testsuite/cargo_add/rename/stderr.log deleted file mode 100644 index f8621cd26c2..00000000000 --- a/tests/testsuite/cargo_add/rename/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/rename/stderr.term.svg b/tests/testsuite/cargo_add/rename/stderr.term.svg new file mode 100644 index 00000000000..67da0f3dbfd --- /dev/null +++ b/tests/testsuite/cargo_add/rename/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/require_weak/mod.rs b/tests/testsuite/cargo_add/require_weak/mod.rs index ab946625982..cc60c5d10d5 100644 --- a/tests/testsuite/cargo_add/require_weak/mod.rs +++ b/tests/testsuite/cargo_add/require_weak/mod.rs @@ -26,7 +26,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/require_weak/stderr.log b/tests/testsuite/cargo_add/require_weak/stderr.log deleted file mode 100644 index 025651f187e..00000000000 --- a/tests/testsuite/cargo_add/require_weak/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/require_weak/stderr.term.svg b/tests/testsuite/cargo_add/require_weak/stderr.term.svg new file mode 100644 index 00000000000..810a3d4fc86 --- /dev/null +++ b/tests/testsuite/cargo_add/require_weak/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs index 1aa4a701625..1331733bf37 100644 --- a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs @@ -29,7 +29,7 @@ fn case() { .assert() .code(0) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_ignore/stderr.log b/tests/testsuite/cargo_add/rust_version_ignore/stderr.log deleted file mode 100644 index d86b1f37d2e..00000000000 --- a/tests/testsuite/cargo_add/rust_version_ignore/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding rust-version-user v0.2.1 to dependencies diff --git a/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg new file mode 100644 index 00000000000..b9eb4bdedd9 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding rust-version-user v0.2.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs index 0b31c88759d..608521aa465 100644 --- a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/stderr.log b/tests/testsuite/cargo_add/rust_version_incompatible/stderr.log deleted file mode 100644 index babed5b23ca..00000000000 --- a/tests/testsuite/cargo_add/rust_version_incompatible/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating `dummy-registry` index -error: could not find version of crate `rust-version-user` that satisfies this package's rust-version of 1.56 -help: use `--ignore-rust-version` to override this behavior -note: the lowest rust-version available for `rust-version-user` is 1.66, used in version 0.1.1 diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_incompatible/stderr.term.svg new file mode 100644 index 00000000000..916d611ad03 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_incompatible/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + + Updating `dummy-registry` index + + error: could not find version of crate `rust-version-user` that satisfies this package's rust-version of 1.56 + + help: use `--ignore-rust-version` to override this behavior + + note: the lowest rust-version available for `rust-version-user` is 1.66, used in version 0.1.1 + + + + + + diff --git a/tests/testsuite/cargo_add/rust_version_latest/mod.rs b/tests/testsuite/cargo_add/rust_version_latest/mod.rs index 77988d59223..c5086316aa3 100644 --- a/tests/testsuite/cargo_add/rust_version_latest/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_latest/mod.rs @@ -28,7 +28,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_latest/stderr.log b/tests/testsuite/cargo_add/rust_version_latest/stderr.log deleted file mode 100644 index d86b1f37d2e..00000000000 --- a/tests/testsuite/cargo_add/rust_version_latest/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding rust-version-user v0.2.1 to dependencies diff --git a/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg new file mode 100644 index 00000000000..b9eb4bdedd9 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding rust-version-user v0.2.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/rust_version_older/mod.rs b/tests/testsuite/cargo_add/rust_version_older/mod.rs index 77988d59223..c5086316aa3 100644 --- a/tests/testsuite/cargo_add/rust_version_older/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_older/mod.rs @@ -28,7 +28,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_older/stderr.log b/tests/testsuite/cargo_add/rust_version_older/stderr.log deleted file mode 100644 index 98f8b722bc6..00000000000 --- a/tests/testsuite/cargo_add/rust_version_older/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index -warning: ignoring `rust-version-user@0.2.1` (which has a rust-version of 1.72) to satisfy this package's rust-version of 1.70 (use `--ignore-rust-version` to override) - Adding rust-version-user v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg new file mode 100644 index 00000000000..904b2013f1c --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Updating `dummy-registry` index + + warning: ignoring `rust-version-user@0.2.1` (which has a rust-version of 1.72) to satisfy this package's rust-version of 1.70 (use `--ignore-rust-version` to override) + + Adding rust-version-user v0.1.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs index 465c51150e5..4f5498dbeba 100644 --- a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs +++ b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs @@ -38,7 +38,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.log b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.log deleted file mode 100644 index 3540f9236cf..00000000000 --- a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding unrelateed-crate v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg new file mode 100644 index 00000000000..0bd6eb9a1ac --- /dev/null +++ b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding unrelateed-crate v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/target/mod.rs b/tests/testsuite/cargo_add/target/mod.rs index fe0a1993791..f683d235aec 100644 --- a/tests/testsuite/cargo_add/target/mod.rs +++ b/tests/testsuite/cargo_add/target/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/target/stderr.log b/tests/testsuite/cargo_add/target/stderr.log deleted file mode 100644 index 10fbe577552..00000000000 --- a/tests/testsuite/cargo_add/target/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies for target `i686-unknown-linux-gnu` - Adding my-package2 v99999.0.0 to dependencies for target `i686-unknown-linux-gnu` diff --git a/tests/testsuite/cargo_add/target/stderr.term.svg b/tests/testsuite/cargo_add/target/stderr.term.svg new file mode 100644 index 00000000000..91684712a00 --- /dev/null +++ b/tests/testsuite/cargo_add/target/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies for target `i686-unknown-linux-gnu` + + Adding my-package2 v99999.0.0 to dependencies for target `i686-unknown-linux-gnu` + + + + + + diff --git a/tests/testsuite/cargo_add/target_cfg/mod.rs b/tests/testsuite/cargo_add/target_cfg/mod.rs index 4932822889d..dcfebafa915 100644 --- a/tests/testsuite/cargo_add/target_cfg/mod.rs +++ b/tests/testsuite/cargo_add/target_cfg/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/target_cfg/stderr.log b/tests/testsuite/cargo_add/target_cfg/stderr.log deleted file mode 100644 index a94b4ba0da4..00000000000 --- a/tests/testsuite/cargo_add/target_cfg/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies for target `cfg(unix)` - Adding my-package2 v99999.0.0 to dependencies for target `cfg(unix)` diff --git a/tests/testsuite/cargo_add/target_cfg/stderr.term.svg b/tests/testsuite/cargo_add/target_cfg/stderr.term.svg new file mode 100644 index 00000000000..19740f04799 --- /dev/null +++ b/tests/testsuite/cargo_add/target_cfg/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies for target `cfg(unix)` + + Adding my-package2 v99999.0.0 to dependencies for target `cfg(unix)` + + + + + + diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs index 50bae81786f..448d6eba7e2 100644 --- a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs +++ b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.log b/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.log deleted file mode 100644 index e66b29e581e..00000000000 --- a/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Adding foo (workspace) to dependencies -error: unrecognized feature for crate foo: not_recognized -disabled features: - merge, merge-base, unrelated -enabled features: - default-base, default-merge-base, default-test-base - long-feature-name-because-of-formatting-reasons, test, test-base diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.term.svg b/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.term.svg new file mode 100644 index 00000000000..dfc9c508233 --- /dev/null +++ b/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + + Adding foo (workspace) to dependencies + + error: unrecognized feature for crate foo: not_recognized + + disabled features: + + merge, merge-base, unrelated + + enabled features: + + default-base, default-merge-base, default-test-base + + long-feature-name-because-of-formatting-reasons, test, test-base + + + + + + diff --git a/tests/testsuite/cargo_add/vers/mod.rs b/tests/testsuite/cargo_add/vers/mod.rs index 58907a95ff4..dd0645e50f9 100644 --- a/tests/testsuite/cargo_add/vers/mod.rs +++ b/tests/testsuite/cargo_add/vers/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/vers/stderr.log b/tests/testsuite/cargo_add/vers/stderr.log deleted file mode 100644 index 910ec255e83..00000000000 --- a/tests/testsuite/cargo_add/vers/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package >=0.1.1 to dependencies diff --git a/tests/testsuite/cargo_add/vers/stderr.term.svg b/tests/testsuite/cargo_add/vers/stderr.term.svg new file mode 100644 index 00000000000..f236cef595e --- /dev/null +++ b/tests/testsuite/cargo_add/vers/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Updating `dummy-registry` index + + Adding my-package >=0.1.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/workspace_name/mod.rs b/tests/testsuite/cargo_add/workspace_name/mod.rs index ab541851e89..f320cc11c45 100644 --- a/tests/testsuite/cargo_add/workspace_name/mod.rs +++ b/tests/testsuite/cargo_add/workspace_name/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_name/stderr.log b/tests/testsuite/cargo_add/workspace_name/stderr.log deleted file mode 100644 index c98958c63df..00000000000 --- a/tests/testsuite/cargo_add/workspace_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/workspace_name/stderr.term.svg b/tests/testsuite/cargo_add/workspace_name/stderr.term.svg new file mode 100644 index 00000000000..298799cea86 --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_name/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/workspace_path/mod.rs b/tests/testsuite/cargo_add/workspace_path/mod.rs index a702d3d49fc..1a5952f4a75 100644 --- a/tests/testsuite/cargo_add/workspace_path/mod.rs +++ b/tests/testsuite/cargo_add/workspace_path/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_path/stderr.log b/tests/testsuite/cargo_add/workspace_path/stderr.log deleted file mode 100644 index c98958c63df..00000000000 --- a/tests/testsuite/cargo_add/workspace_path/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/workspace_path/stderr.term.svg b/tests/testsuite/cargo_add/workspace_path/stderr.term.svg new file mode 100644 index 00000000000..298799cea86 --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_path/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs index dce163829df..5c12f879ffd 100644 --- a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs +++ b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_path_dev/stderr.log b/tests/testsuite/cargo_add/workspace_path_dev/stderr.log deleted file mode 100644 index a6ffd22940c..00000000000 --- a/tests/testsuite/cargo_add/workspace_path_dev/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dev-dependencies diff --git a/tests/testsuite/cargo_add/workspace_path_dev/stderr.term.svg b/tests/testsuite/cargo_add/workspace_path_dev/stderr.term.svg new file mode 100644 index 00000000000..a09279b9ecf --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_path_dev/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Adding cargo-list-test-fixture-dependency (local) to dev-dependencies + + + + + + diff --git a/tests/testsuite/cargo_bench/help/mod.rs b/tests/testsuite/cargo_bench/help/mod.rs index d2b1737bb1f..3f38147a101 100644 --- a/tests/testsuite/cargo_bench/help/mod.rs +++ b/tests/testsuite/cargo_bench/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_bench/help/stdout.log b/tests/testsuite/cargo_bench/help/stdout.log deleted file mode 100644 index cfea6e01e41..00000000000 --- a/tests/testsuite/cargo_bench/help/stdout.log +++ /dev/null @@ -1,59 +0,0 @@ -Execute all benchmarks of a local package - -Usage: cargo[EXE] bench [OPTIONS] [BENCHNAME] [-- [ARGS]...] - -Arguments: - [BENCHNAME] If specified, only run benches containing this string in their names - [ARGS]... Arguments for the bench binary - -Options: - --no-run Compile, but don't run benchmarks - --no-fail-fast Run all benchmarks regardless of failure - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to run benchmarks for - --workspace Benchmark all packages in the workspace - --exclude Exclude packages from the benchmark - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Benchmark only this package's library - --bins Benchmark all binaries - --bin [] Benchmark only the specified binary - --examples Benchmark all examples - --example [] Benchmark only the specified example - --tests Benchmark all test targets - --test [] Benchmark only the specified test target - --benches Benchmark all bench targets - --bench [] Benchmark only the specified bench target - --all-targets Benchmark all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help bench` for more detailed information. diff --git a/tests/testsuite/cargo_bench/help/stdout.term.svg b/tests/testsuite/cargo_bench/help/stdout.term.svg new file mode 100644 index 00000000000..02045214e3e --- /dev/null +++ b/tests/testsuite/cargo_bench/help/stdout.term.svg @@ -0,0 +1,144 @@ + + + + + + + Execute all benchmarks of a local package + + + + Usage: cargo[EXE] bench [OPTIONS] [BENCHNAME] [-- [ARGS]...] + + + + Arguments: + + [BENCHNAME] If specified, only run benches containing this string in their names + + [ARGS]... Arguments for the bench binary + + + + Options: + + --no-run Compile, but don't run benchmarks + + --no-fail-fast Run all benchmarks regardless of failure + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to run benchmarks for + + --workspace Benchmark all packages in the workspace + + --exclude <SPEC> Exclude packages from the benchmark + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Benchmark only this package's library + + --bins Benchmark all binaries + + --bin [<NAME>] Benchmark only the specified binary + + --examples Benchmark all examples + + --example [<NAME>] Benchmark only the specified example + + --tests Benchmark all test targets + + --test [<NAME>] Benchmark only the specified test target + + --benches Benchmark all bench targets + + --bench [<NAME>] Benchmark only the specified bench target + + --all-targets Benchmark all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help bench` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_bench/no_keep_going/mod.rs b/tests/testsuite/cargo_bench/no_keep_going/mod.rs index 8d32b17eb24..c710ea73a98 100644 --- a/tests/testsuite/cargo_bench/no_keep_going/mod.rs +++ b/tests/testsuite/cargo_bench/no_keep_going/mod.rs @@ -17,5 +17,5 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_bench/no_keep_going/stderr.log b/tests/testsuite/cargo_bench/no_keep_going/stderr.log deleted file mode 100644 index daaa8f0932b..00000000000 --- a/tests/testsuite/cargo_bench/no_keep_going/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: unexpected argument '--keep-going' found - - tip: use `--no-fail-fast` to run as many tests as possible regardless of failure - -Usage: cargo[EXE] bench [OPTIONS] [BENCHNAME] [-- [ARGS]...] - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_bench/no_keep_going/stderr.term.svg b/tests/testsuite/cargo_bench/no_keep_going/stderr.term.svg new file mode 100644 index 00000000000..e90ae868538 --- /dev/null +++ b/tests/testsuite/cargo_bench/no_keep_going/stderr.term.svg @@ -0,0 +1,42 @@ + + + + + + + error: unexpected argument '--keep-going' found + + + + tip: use `--no-fail-fast` to run as many tests as possible regardless of failure + + + + Usage: cargo[EXE] bench [OPTIONS] [BENCHNAME] [-- [ARGS]...] + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_build/help/mod.rs b/tests/testsuite/cargo_build/help/mod.rs index 127fe424f29..032ab15927a 100644 --- a/tests/testsuite/cargo_build/help/mod.rs +++ b/tests/testsuite/cargo_build/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_build/help/stdout.log b/tests/testsuite/cargo_build/help/stdout.log deleted file mode 100644 index 3918fd44aaf..00000000000 --- a/tests/testsuite/cargo_build/help/stdout.log +++ /dev/null @@ -1,58 +0,0 @@ -Compile a local package and all of its dependencies - -Usage: cargo[EXE] build [OPTIONS] - -Options: - --ignore-rust-version Ignore `rust-version` specification in packages - --future-incompat-report Outputs a future incompatibility report at the end of the build - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to build (see `cargo help pkgid`) - --workspace Build all packages in the workspace - --exclude Exclude packages from the build - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Build only this package's library - --bins Build all binaries - --bin [] Build only the specified binary - --examples Build all examples - --example [] Build only the specified example - --tests Build all test targets - --test [] Build only the specified test target - --benches Build all bench targets - --bench [] Build only the specified bench target - --all-targets Build all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --out-dir Copy final artifacts to this directory (unstable) - --build-plan Output the build plan in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help build` for more detailed information. diff --git a/tests/testsuite/cargo_build/help/stdout.term.svg b/tests/testsuite/cargo_build/help/stdout.term.svg new file mode 100644 index 00000000000..6f0982aae14 --- /dev/null +++ b/tests/testsuite/cargo_build/help/stdout.term.svg @@ -0,0 +1,142 @@ + + + + + + + Compile a local package and all of its dependencies + + + + Usage: cargo[EXE] build [OPTIONS] + + + + Options: + + --ignore-rust-version Ignore `rust-version` specification in packages + + --future-incompat-report Outputs a future incompatibility report at the end of the build + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to build (see `cargo help pkgid`) + + --workspace Build all packages in the workspace + + --exclude <SPEC> Exclude packages from the build + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Build only this package's library + + --bins Build all binaries + + --bin [<NAME>] Build only the specified binary + + --examples Build all examples + + --example [<NAME>] Build only the specified example + + --tests Build all test targets + + --test [<NAME>] Build only the specified test target + + --benches Build all bench targets + + --bench [<NAME>] Build only the specified bench target + + --all-targets Build all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --out-dir <PATH> Copy final artifacts to this directory (unstable) + + --build-plan Output the build plan in JSON (unstable) + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help build` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_check/help/mod.rs b/tests/testsuite/cargo_check/help/mod.rs index 16c690c410d..d54aa58f2e5 100644 --- a/tests/testsuite/cargo_check/help/mod.rs +++ b/tests/testsuite/cargo_check/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_check/help/stdout.log b/tests/testsuite/cargo_check/help/stdout.log deleted file mode 100644 index 7b628979823..00000000000 --- a/tests/testsuite/cargo_check/help/stdout.log +++ /dev/null @@ -1,56 +0,0 @@ -Check a local package and all of its dependencies for errors - -Usage: cargo[EXE] check [OPTIONS] - -Options: - --ignore-rust-version Ignore `rust-version` specification in packages - --future-incompat-report Outputs a future incompatibility report at the end of the build - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package(s) to check - --workspace Check all packages in the workspace - --exclude Exclude packages from the check - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Check only this package's library - --bins Check all binaries - --bin [] Check only the specified binary - --examples Check all examples - --example [] Check only the specified example - --tests Check all test targets - --test [] Check only the specified test target - --benches Check all bench targets - --bench [] Check only the specified bench target - --all-targets Check all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Check artifacts in release mode, with optimizations - --profile Check artifacts with the specified profile - --target [] Check for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help check` for more detailed information. diff --git a/tests/testsuite/cargo_check/help/stdout.term.svg b/tests/testsuite/cargo_check/help/stdout.term.svg new file mode 100644 index 00000000000..aa654c95db3 --- /dev/null +++ b/tests/testsuite/cargo_check/help/stdout.term.svg @@ -0,0 +1,138 @@ + + + + + + + Check a local package and all of its dependencies for errors + + + + Usage: cargo[EXE] check [OPTIONS] + + + + Options: + + --ignore-rust-version Ignore `rust-version` specification in packages + + --future-incompat-report Outputs a future incompatibility report at the end of the build + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package(s) to check + + --workspace Check all packages in the workspace + + --exclude <SPEC> Exclude packages from the check + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Check only this package's library + + --bins Check all binaries + + --bin [<NAME>] Check only the specified binary + + --examples Check all examples + + --example [<NAME>] Check only the specified example + + --tests Check all test targets + + --test [<NAME>] Check only the specified test target + + --benches Check all bench targets + + --bench [<NAME>] Check only the specified bench target + + --all-targets Check all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Check artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Check artifacts with the specified profile + + --target [<TRIPLE>] Check for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help check` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_clean/help/mod.rs b/tests/testsuite/cargo_clean/help/mod.rs index 533dc1337d8..80b2df45286 100644 --- a/tests/testsuite/cargo_clean/help/mod.rs +++ b/tests/testsuite/cargo_clean/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_clean/help/stdout.log b/tests/testsuite/cargo_clean/help/stdout.log deleted file mode 100644 index 80571e5dccb..00000000000 --- a/tests/testsuite/cargo_clean/help/stdout.log +++ /dev/null @@ -1,30 +0,0 @@ -Remove artifacts that cargo has generated in the past - -Usage: cargo[EXE] clean [OPTIONS] - -Options: - --doc Whether or not to clean just the documentation directory - -n, --dry-run Display what would be deleted without deleting anything - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package to clean artifacts for - -Compilation Options: - -r, --release Whether or not to clean release artifacts - --profile Clean artifacts of the specified profile - --target [] Target triple to clean output for - --target-dir Directory for all generated artifacts - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help clean` for more detailed information. diff --git a/tests/testsuite/cargo_clean/help/stdout.term.svg b/tests/testsuite/cargo_clean/help/stdout.term.svg new file mode 100644 index 00000000000..d451cddf913 --- /dev/null +++ b/tests/testsuite/cargo_clean/help/stdout.term.svg @@ -0,0 +1,86 @@ + + + + + + + Remove artifacts that cargo has generated in the past + + + + Usage: cargo[EXE] clean [OPTIONS] + + + + Options: + + --doc Whether or not to clean just the documentation directory + + -n, --dry-run Display what would be deleted without deleting anything + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to clean artifacts for + + + + Compilation Options: + + -r, --release Whether or not to clean release artifacts + + --profile <PROFILE-NAME> Clean artifacts of the specified profile + + --target [<TRIPLE>] Target triple to clean output for + + --target-dir <DIRECTORY> Directory for all generated artifacts + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help clean` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_config/help/mod.rs b/tests/testsuite/cargo_config/help/mod.rs index 000a80d9dbb..8e45f699803 100644 --- a/tests/testsuite/cargo_config/help/mod.rs +++ b/tests/testsuite/cargo_config/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_config/help/stdout.log b/tests/testsuite/cargo_config/help/stdout.log deleted file mode 100644 index 5c14335fc94..00000000000 --- a/tests/testsuite/cargo_config/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Inspect configuration values - -Usage: cargo[EXE] config [OPTIONS] - -Commands: - get - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network diff --git a/tests/testsuite/cargo_config/help/stdout.term.svg b/tests/testsuite/cargo_config/help/stdout.term.svg new file mode 100644 index 00000000000..7798f77494a --- /dev/null +++ b/tests/testsuite/cargo_config/help/stdout.term.svg @@ -0,0 +1,64 @@ + + + + + + + Inspect configuration values + + + + Usage: cargo[EXE] config [OPTIONS] <COMMAND> + + + + Commands: + + get + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + + + diff --git a/tests/testsuite/cargo_doc/help/mod.rs b/tests/testsuite/cargo_doc/help/mod.rs index 4c33ea6e9d6..a293273cdf8 100644 --- a/tests/testsuite/cargo_doc/help/mod.rs +++ b/tests/testsuite/cargo_doc/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_doc/help/stdout.log b/tests/testsuite/cargo_doc/help/stdout.log deleted file mode 100644 index e1a19bedd3b..00000000000 --- a/tests/testsuite/cargo_doc/help/stdout.log +++ /dev/null @@ -1,53 +0,0 @@ -Build a package's documentation - -Usage: cargo[EXE] doc [OPTIONS] - -Options: - --open Opens the docs in a browser after the operation - --no-deps Don't build documentation for dependencies - --document-private-items Document private items - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to document - --workspace Document all packages in the workspace - --exclude Exclude packages from the build - --all Alias for --workspace (deprecated) - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Target Selection: - --lib Document only this package's library - --bins Document all binaries - --bin [] Document only the specified binary - --examples Document all examples - --example [] Document only the specified example - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help doc` for more detailed information. diff --git a/tests/testsuite/cargo_doc/help/stdout.term.svg b/tests/testsuite/cargo_doc/help/stdout.term.svg new file mode 100644 index 00000000000..4fe41bb9949 --- /dev/null +++ b/tests/testsuite/cargo_doc/help/stdout.term.svg @@ -0,0 +1,132 @@ + + + + + + + Build a package's documentation + + + + Usage: cargo[EXE] doc [OPTIONS] + + + + Options: + + --open Opens the docs in a browser after the operation + + --no-deps Don't build documentation for dependencies + + --document-private-items Document private items + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to document + + --workspace Document all packages in the workspace + + --exclude <SPEC> Exclude packages from the build + + --all Alias for --workspace (deprecated) + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Target Selection: + + --lib Document only this package's library + + --bins Document all binaries + + --bin [<NAME>] Document only the specified binary + + --examples Document all examples + + --example [<NAME>] Document only the specified example + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help doc` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_fetch/help/mod.rs b/tests/testsuite/cargo_fetch/help/mod.rs index e44d202c7a0..b45a1f5e04d 100644 --- a/tests/testsuite/cargo_fetch/help/mod.rs +++ b/tests/testsuite/cargo_fetch/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_fetch/help/stdout.log b/tests/testsuite/cargo_fetch/help/stdout.log deleted file mode 100644 index 5645a6c033d..00000000000 --- a/tests/testsuite/cargo_fetch/help/stdout.log +++ /dev/null @@ -1,22 +0,0 @@ -Fetch dependencies of a package from the network - -Usage: cargo[EXE] fetch [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Compilation Options: - --target [] Fetch dependencies for the target triple - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help fetch` for more detailed information. diff --git a/tests/testsuite/cargo_fetch/help/stdout.term.svg b/tests/testsuite/cargo_fetch/help/stdout.term.svg new file mode 100644 index 00000000000..8dca7e8d2ad --- /dev/null +++ b/tests/testsuite/cargo_fetch/help/stdout.term.svg @@ -0,0 +1,70 @@ + + + + + + + Fetch dependencies of a package from the network + + + + Usage: cargo[EXE] fetch [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Compilation Options: + + --target [<TRIPLE>] Fetch dependencies for the target triple + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help fetch` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_fix/help/mod.rs b/tests/testsuite/cargo_fix/help/mod.rs index bd849d5fce2..5e648b8c9ef 100644 --- a/tests/testsuite/cargo_fix/help/mod.rs +++ b/tests/testsuite/cargo_fix/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_fix/help/stdout.log b/tests/testsuite/cargo_fix/help/stdout.log deleted file mode 100644 index a93215c502d..00000000000 --- a/tests/testsuite/cargo_fix/help/stdout.log +++ /dev/null @@ -1,60 +0,0 @@ -Automatically fix lint warnings reported by rustc - -Usage: cargo[EXE] fix [OPTIONS] - -Options: - --edition Fix in preparation for the next edition - --edition-idioms Fix warnings to migrate to the idioms of an edition - --broken-code Fix code even if it already has compiler errors - --allow-no-vcs Fix code even if a VCS was not detected - --allow-dirty Fix code even if the working directory is dirty - --allow-staged Fix code even if the working directory has staged changes - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package(s) to fix - --workspace Fix all packages in the workspace - --exclude Exclude packages from the fixes - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Fix only this package's library - --bins Fix all binaries - --bin [] Fix only the specified binary - --examples Fix all examples - --example [] Fix only the specified example - --tests Fix all test targets - --test [] Fix only the specified test target - --benches Fix all bench targets - --bench [] Fix only the specified bench target - --all-targets Fix all targets (default) - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Fix artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Fix for the target triple - --target-dir Directory for all generated artifacts - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help fix` for more detailed information. diff --git a/tests/testsuite/cargo_fix/help/stdout.term.svg b/tests/testsuite/cargo_fix/help/stdout.term.svg new file mode 100644 index 00000000000..7e273e22a21 --- /dev/null +++ b/tests/testsuite/cargo_fix/help/stdout.term.svg @@ -0,0 +1,146 @@ + + + + + + + Automatically fix lint warnings reported by rustc + + + + Usage: cargo[EXE] fix [OPTIONS] + + + + Options: + + --edition Fix in preparation for the next edition + + --edition-idioms Fix warnings to migrate to the idioms of an edition + + --broken-code Fix code even if it already has compiler errors + + --allow-no-vcs Fix code even if a VCS was not detected + + --allow-dirty Fix code even if the working directory is dirty + + --allow-staged Fix code even if the working directory has staged changes + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package(s) to fix + + --workspace Fix all packages in the workspace + + --exclude <SPEC> Exclude packages from the fixes + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Fix only this package's library + + --bins Fix all binaries + + --bin [<NAME>] Fix only the specified binary + + --examples Fix all examples + + --example [<NAME>] Fix only the specified example + + --tests Fix all test targets + + --test [<NAME>] Fix only the specified test target + + --benches Fix all bench targets + + --bench [<NAME>] Fix only the specified bench target + + --all-targets Fix all targets (default) + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Fix artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Fix for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help fix` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_generate_lockfile/help/mod.rs b/tests/testsuite/cargo_generate_lockfile/help/mod.rs index 7e5d87d66f5..12831bc7fb1 100644 --- a/tests/testsuite/cargo_generate_lockfile/help/mod.rs +++ b/tests/testsuite/cargo_generate_lockfile/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_generate_lockfile/help/stdout.log b/tests/testsuite/cargo_generate_lockfile/help/stdout.log deleted file mode 100644 index 5d0bf1359b6..00000000000 --- a/tests/testsuite/cargo_generate_lockfile/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Generate the lockfile for a package - -Usage: cargo[EXE] generate-lockfile [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help generate-lockfile` for more detailed information. diff --git a/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg b/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg new file mode 100644 index 00000000000..941ea80af5f --- /dev/null +++ b/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg @@ -0,0 +1,64 @@ + + + + + + + Generate the lockfile for a package + + + + Usage: cargo[EXE] generate-lockfile [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help generate-lockfile` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_git_checkout/help/mod.rs b/tests/testsuite/cargo_git_checkout/help/mod.rs index 07f387069dd..35bbf7fec9e 100644 --- a/tests/testsuite/cargo_git_checkout/help/mod.rs +++ b/tests/testsuite/cargo_git_checkout/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_git_checkout/help/stdout.log b/tests/testsuite/cargo_git_checkout/help/stdout.log deleted file mode 100644 index 675090fd344..00000000000 --- a/tests/testsuite/cargo_git_checkout/help/stdout.log +++ /dev/null @@ -1 +0,0 @@ -The `git-checkout` command has been removed. diff --git a/tests/testsuite/cargo_git_checkout/help/stdout.term.svg b/tests/testsuite/cargo_git_checkout/help/stdout.term.svg new file mode 100644 index 00000000000..63cb2adc8f4 --- /dev/null +++ b/tests/testsuite/cargo_git_checkout/help/stdout.term.svg @@ -0,0 +1,25 @@ + + + + + + + The `git-checkout` command has been removed. + + + + + + diff --git a/tests/testsuite/cargo_help/help/mod.rs b/tests/testsuite/cargo_help/help/mod.rs index a8640b73cdf..703577f2768 100644 --- a/tests/testsuite/cargo_help/help/mod.rs +++ b/tests/testsuite/cargo_help/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_help/help/stdout.log b/tests/testsuite/cargo_help/help/stdout.log deleted file mode 100644 index 1f7a710d6d6..00000000000 --- a/tests/testsuite/cargo_help/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Displays help for a cargo subcommand - -Usage: cargo[EXE] help [OPTIONS] [COMMAND] - -Arguments: - [COMMAND] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network diff --git a/tests/testsuite/cargo_help/help/stdout.term.svg b/tests/testsuite/cargo_help/help/stdout.term.svg new file mode 100644 index 00000000000..901cee097cd --- /dev/null +++ b/tests/testsuite/cargo_help/help/stdout.term.svg @@ -0,0 +1,64 @@ + + + + + + + Displays help for a cargo subcommand + + + + Usage: cargo[EXE] help [OPTIONS] [COMMAND] + + + + Arguments: + + [COMMAND] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + + + diff --git a/tests/testsuite/cargo_init/auto_git/mod.rs b/tests/testsuite/cargo_init/auto_git/mod.rs index f2884590316..8780abf8cb9 100644 --- a/tests/testsuite/cargo_init/auto_git/mod.rs +++ b/tests/testsuite/cargo_init/auto_git/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/auto_git/stderr.log b/tests/testsuite/cargo_init/auto_git/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/auto_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/auto_git/stderr.term.svg b/tests/testsuite/cargo_init/auto_git/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/auto_git/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs index 44f2963e45d..0ae9d6355ce 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs index 6adab0b8641..d0dd40c4d19 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src").is_dir()); diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs index c22fbb1deab..15a52a1d7c0 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs index 31c5af6b035..388fb2bb91a 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src").is_dir()); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs index 355a37d1e24..df89641fab7 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src/main.rs").is_file()); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs index 31c5af6b035..388fb2bb91a 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src").is_dir()); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs index 8860745be89..e382ddb4c46 100644 --- a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs +++ b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs @@ -13,7 +13,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert!(!cwd.join("Cargo.toml").is_file()); } diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/stderr.log b/tests/testsuite/cargo_init/both_lib_and_bin/stderr.log deleted file mode 100644 index 9d635a42725..00000000000 --- a/tests/testsuite/cargo_init/both_lib_and_bin/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: can't specify both lib and binary outputs diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/stderr.term.svg b/tests/testsuite/cargo_init/both_lib_and_bin/stderr.term.svg new file mode 100644 index 00000000000..05b47c7d0d6 --- /dev/null +++ b/tests/testsuite/cargo_init/both_lib_and_bin/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: can't specify both lib and binary outputs + + + + + + diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs index 882f0914886..c73a2950249 100644 --- a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs +++ b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs @@ -15,5 +15,5 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log deleted file mode 100644 index 325e832453e..00000000000 --- a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -error: cannot have a package with multiple libraries, found both `case.rs` and `lib.rs` diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.term.svg b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.term.svg new file mode 100644 index 00000000000..be8c5675d4b --- /dev/null +++ b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + error: cannot have a package with multiple libraries, found both `case.rs` and `lib.rs` + + + + + + diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs index 671f755be6b..2c67e36d74e 100644 --- a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs +++ b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("Cargo.toml").is_file()); diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log deleted file mode 100644 index 8dbd2aaf064..00000000000 --- a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot have a package with multiple libraries, found both `src/lib.rs` and `lib.rs` diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.term.svg b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.term.svg new file mode 100644 index 00000000000..16fa88745f6 --- /dev/null +++ b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: cannot have a package with multiple libraries, found both `src/lib.rs` and `lib.rs` + + + + + + diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs index 44f2963e45d..0ae9d6355ce 100644 --- a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs +++ b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.term.svg b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs index 44f2963e45d..0ae9d6355ce 100644 --- a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs +++ b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log deleted file mode 100644 index 9c36c9c97e4..00000000000 --- a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) package -warning: file `case.rs` seems to be a library file -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.term.svg b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.term.svg new file mode 100644 index 00000000000..e92d5b16d13 --- /dev/null +++ b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Creating binary (application) package + + warning: file `case.rs` seems to be a library file + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs index 942de0148dc..e807e9ec845 100644 --- a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs +++ b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log deleted file mode 100644 index 7063e1dd970..00000000000 --- a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating library package -warning: file `case.rs` seems to be a binary (application) file -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.term.svg b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.term.svg new file mode 100644 index 00000000000..19cfec206fa --- /dev/null +++ b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Creating library package + + warning: file `case.rs` seems to be a binary (application) file + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs index 8f9a618d737..a2e3044c61f 100644 --- a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs +++ b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log b/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.term.svg b/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/formats_source/mod.rs b/tests/testsuite/cargo_init/formats_source/mod.rs index 32f3ecf3ef2..e4333b88e27 100644 --- a/tests/testsuite/cargo_init/formats_source/mod.rs +++ b/tests/testsuite/cargo_init/formats_source/mod.rs @@ -24,7 +24,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/formats_source/stderr.log b/tests/testsuite/cargo_init/formats_source/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/formats_source/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/formats_source/stderr.term.svg b/tests/testsuite/cargo_init/formats_source/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/formats_source/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs index b198fac5314..ad1d282cef9 100644 --- a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/fossil_autodetect/stderr.log b/tests/testsuite/cargo_init/fossil_autodetect/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/fossil_autodetect/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/fossil_autodetect/stderr.term.svg b/tests/testsuite/cargo_init/fossil_autodetect/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/fossil_autodetect/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/git_autodetect/mod.rs b/tests/testsuite/cargo_init/git_autodetect/mod.rs index b572aa4c147..ff4bf660d12 100644 --- a/tests/testsuite/cargo_init/git_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/git_autodetect/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/git_autodetect/stderr.log b/tests/testsuite/cargo_init/git_autodetect/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/git_autodetect/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/git_autodetect/stderr.term.svg b/tests/testsuite/cargo_init/git_autodetect/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/git_autodetect/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs index f71fb04489f..72f88914a4e 100644 --- a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs +++ b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.term.svg b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/help/mod.rs b/tests/testsuite/cargo_init/help/mod.rs index 87eec6886c3..490a624c5b5 100644 --- a/tests/testsuite/cargo_init/help/mod.rs +++ b/tests/testsuite/cargo_init/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_init/help/stdout.log b/tests/testsuite/cargo_init/help/stdout.log deleted file mode 100644 index 197a5f8d1e1..00000000000 --- a/tests/testsuite/cargo_init/help/stdout.log +++ /dev/null @@ -1,30 +0,0 @@ -Create a new cargo package in an existing directory - -Usage: cargo[EXE] init [OPTIONS] [PATH] - -Arguments: - [PATH] [default: .] - -Options: - --vcs Initialize a new repository for the given version control system, - overriding a global configuration. [possible values: git, hg, pijul, - fossil, none] - --bin Use a binary (application) template [default] - --lib Use a library template - --edition Edition to set for the crate generated [possible values: 2015, 2018, - 2021, 2024] - --name Set the resulting package name, defaults to the directory name - --registry Registry to use - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help init` for more detailed information. diff --git a/tests/testsuite/cargo_init/help/stdout.term.svg b/tests/testsuite/cargo_init/help/stdout.term.svg new file mode 100644 index 00000000000..e95cc8e0302 --- /dev/null +++ b/tests/testsuite/cargo_init/help/stdout.term.svg @@ -0,0 +1,86 @@ + + + + + + + Create a new cargo package in an existing directory + + + + Usage: cargo[EXE] init [OPTIONS] [PATH] + + + + Arguments: + + [PATH] [default: .] + + + + Options: + + --vcs <VCS> Initialize a new repository for the given version control system, + + overriding a global configuration. [possible values: git, hg, pijul, + + fossil, none] + + --bin Use a binary (application) template [default] + + --lib Use a library template + + --edition <YEAR> Edition to set for the crate generated [possible values: 2015, 2018, + + 2021, 2024] + + --name <NAME> Set the resulting package name, defaults to the directory name + + --registry <REGISTRY> Registry to use + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help init` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs b/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs index 5ca689fced7..fc0592879f4 100644 --- a/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs +++ b/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs @@ -17,7 +17,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.term.svg b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs index 59b6eb5e3e2..4bfdf6195c9 100644 --- a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs +++ b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log b/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.term.svg b/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs index 59b6eb5e3e2..4bfdf6195c9 100644 --- a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs +++ b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log b/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.term.svg b/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs index ce783bbd255..818a5407165 100644 --- a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs +++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log b/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.term.svg b/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs index fe081113438..d8038be0ec7 100644 --- a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs +++ b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs @@ -15,7 +15,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert!(!foo.join("Cargo.toml").is_file()); } diff --git a/tests/testsuite/cargo_init/invalid_dir_name/stderr.log b/tests/testsuite/cargo_init/invalid_dir_name/stderr.log deleted file mode 100644 index bf865349586..00000000000 --- a/tests/testsuite/cargo_init/invalid_dir_name/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Creating binary (application) package -error: invalid character `.` in package name: `foo.bar`, characters must be Unicode XID characters (numbers, `-`, `_`, or most letters) -If you need a package name to not match the directory name, consider using --name flag. -If you need a binary with the name "foo.bar", use a valid package name, and set the binary name to be different from the package. This can be done by setting the binary filename to `src/bin/foo.bar.rs` or change the name in Cargo.toml with: - - [[bin]] - name = "foo.bar" - path = "src/main.rs" - diff --git a/tests/testsuite/cargo_init/invalid_dir_name/stderr.term.svg b/tests/testsuite/cargo_init/invalid_dir_name/stderr.term.svg new file mode 100644 index 00000000000..ed6458264ba --- /dev/null +++ b/tests/testsuite/cargo_init/invalid_dir_name/stderr.term.svg @@ -0,0 +1,44 @@ + + + + + + + Creating binary (application) package + + error: invalid character `.` in package name: `foo.bar`, characters must be Unicode XID characters (numbers, `-`, `_`, or most letters) + + If you need a package name to not match the directory name, consider using --name flag. + + If you need a binary with the name "foo.bar", use a valid package name, and set the binary name to be different from the package. This can be done by setting the binary filename to `src/bin/foo.bar.rs` or change the name in Cargo.toml with: + + + + [[bin]] + + name = "foo.bar" + + path = "src/main.rs" + + + + + + + + diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs index 355a37d1e24..df89641fab7 100644 --- a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs +++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src/main.rs").is_file()); diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.term.svg b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs index 355a37d1e24..df89641fab7 100644 --- a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs +++ b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src/main.rs").is_file()); diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/stderr.log b/tests/testsuite/cargo_init/lib_already_exists_src/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/lib_already_exists_src/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/stderr.term.svg b/tests/testsuite/cargo_init/lib_already_exists_src/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/lib_already_exists_src/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs index b198fac5314..ad1d282cef9 100644 --- a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/stderr.log b/tests/testsuite/cargo_init/mercurial_autodetect/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/mercurial_autodetect/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/stderr.term.svg b/tests/testsuite/cargo_init/mercurial_autodetect/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/mercurial_autodetect/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs index cc023a6f257..6d83b9abf9c 100644 --- a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs +++ b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("Cargo.toml").is_file()); diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log b/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log deleted file mode 100644 index 21a1dabee6d..00000000000 --- a/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ -error: multiple possible binary sources found: - main.rs - case.rs -cannot automatically generate Cargo.toml as the main target would be ambiguous diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.term.svg b/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.term.svg new file mode 100644 index 00000000000..014fe099716 --- /dev/null +++ b/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + error: multiple possible binary sources found: + + main.rs + + case.rs + + cannot automatically generate Cargo.toml as the main target would be ambiguous + + + + + + diff --git a/tests/testsuite/cargo_init/no_filename/mod.rs b/tests/testsuite/cargo_init/no_filename/mod.rs index 650d8358048..439189de1a1 100644 --- a/tests/testsuite/cargo_init/no_filename/mod.rs +++ b/tests/testsuite/cargo_init/no_filename/mod.rs @@ -12,5 +12,5 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_init/no_filename/stderr.log b/tests/testsuite/cargo_init/no_filename/stderr.log deleted file mode 100644 index bd087ec9052..00000000000 --- a/tests/testsuite/cargo_init/no_filename/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot auto-detect package name from path "/" ; use --name to override diff --git a/tests/testsuite/cargo_init/no_filename/stderr.term.svg b/tests/testsuite/cargo_init/no_filename/stderr.term.svg new file mode 100644 index 00000000000..c79694fa28e --- /dev/null +++ b/tests/testsuite/cargo_init/no_filename/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: cannot auto-detect package name from path "/" ; use --name to override + + + + + + diff --git a/tests/testsuite/cargo_init/path_contains_separator/mod.rs b/tests/testsuite/cargo_init/path_contains_separator/mod.rs index 784c751db10..f861375831a 100644 --- a/tests/testsuite/cargo_init/path_contains_separator/mod.rs +++ b/tests/testsuite/cargo_init/path_contains_separator/mod.rs @@ -20,7 +20,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".gitignore").is_file()); diff --git a/tests/testsuite/cargo_init/path_contains_separator/stderr.log b/tests/testsuite/cargo_init/path_contains_separator/stderr.log deleted file mode 100644 index c73f5211447..00000000000 --- a/tests/testsuite/cargo_init/path_contains_separator/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Creating binary (application) package -warning: the path `[ROOT]/case/test:ing/.` contains invalid PATH characters (usually `:`, `;`, or `"`) -It is recommended to use a different name to avoid problems. -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/path_contains_separator/stderr.term.svg b/tests/testsuite/cargo_init/path_contains_separator/stderr.term.svg new file mode 100644 index 00000000000..53e9c0b00f6 --- /dev/null +++ b/tests/testsuite/cargo_init/path_contains_separator/stderr.term.svg @@ -0,0 +1,35 @@ + + + + + + + Creating binary (application) package + + warning: the path `[ROOT]/case/test:ing/.` contains invalid PATH characters (usually `:`, `;`, or `"`) + + It is recommended to use a different name to avoid problems. + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs index b198fac5314..ad1d282cef9 100644 --- a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/pijul_autodetect/stderr.log b/tests/testsuite/cargo_init/pijul_autodetect/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/pijul_autodetect/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/pijul_autodetect/stderr.term.svg b/tests/testsuite/cargo_init/pijul_autodetect/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/pijul_autodetect/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/reserved_name/mod.rs b/tests/testsuite/cargo_init/reserved_name/mod.rs index ff77b12d836..5212765f44f 100644 --- a/tests/testsuite/cargo_init/reserved_name/mod.rs +++ b/tests/testsuite/cargo_init/reserved_name/mod.rs @@ -15,7 +15,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert!(!project_root.join("Cargo.toml").is_file()); } diff --git a/tests/testsuite/cargo_init/reserved_name/stderr.log b/tests/testsuite/cargo_init/reserved_name/stderr.log deleted file mode 100644 index ccc1867bd25..00000000000 --- a/tests/testsuite/cargo_init/reserved_name/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Creating binary (application) package -error: the name `test` cannot be used as a package name, it conflicts with Rust's built-in test library -If you need a package name to not match the directory name, consider using --name flag. -If you need a binary with the name "test", use a valid package name, and set the binary name to be different from the package. This can be done by setting the binary filename to `src/bin/test.rs` or change the name in Cargo.toml with: - - [[bin]] - name = "test" - path = "src/main.rs" - diff --git a/tests/testsuite/cargo_init/reserved_name/stderr.term.svg b/tests/testsuite/cargo_init/reserved_name/stderr.term.svg new file mode 100644 index 00000000000..786e8fdf67f --- /dev/null +++ b/tests/testsuite/cargo_init/reserved_name/stderr.term.svg @@ -0,0 +1,44 @@ + + + + + + + Creating binary (application) package + + error: the name `test` cannot be used as a package name, it conflicts with Rust's built-in test library + + If you need a package name to not match the directory name, consider using --name flag. + + If you need a binary with the name "test", use a valid package name, and set the binary name to be different from the package. This can be done by setting the binary filename to `src/bin/test.rs` or change the name in Cargo.toml with: + + + + [[bin]] + + name = "test" + + path = "src/main.rs" + + + + + + + + diff --git a/tests/testsuite/cargo_init/simple_bin/mod.rs b/tests/testsuite/cargo_init/simple_bin/mod.rs index a2c8360cebf..f6eb6cc9b08 100644 --- a/tests/testsuite/cargo_init/simple_bin/mod.rs +++ b/tests/testsuite/cargo_init/simple_bin/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".gitignore").is_file()); diff --git a/tests/testsuite/cargo_init/simple_bin/stderr.log b/tests/testsuite/cargo_init/simple_bin/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/simple_bin/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_bin/stderr.term.svg b/tests/testsuite/cargo_init/simple_bin/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/simple_bin/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/simple_git/mod.rs b/tests/testsuite/cargo_init/simple_git/mod.rs index 115f4d459b7..de150e87d19 100644 --- a/tests/testsuite/cargo_init/simple_git/mod.rs +++ b/tests/testsuite/cargo_init/simple_git/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/simple_git/stderr.log b/tests/testsuite/cargo_init/simple_git/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/simple_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_git/stderr.term.svg b/tests/testsuite/cargo_init/simple_git/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_git/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs index b8b4777528a..75559019b25 100644 --- a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs +++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log b/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.term.svg b/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/simple_hg/mod.rs b/tests/testsuite/cargo_init/simple_hg/mod.rs index 0a56e30370a..42610e75a58 100644 --- a/tests/testsuite/cargo_init/simple_hg/mod.rs +++ b/tests/testsuite/cargo_init/simple_hg/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/simple_hg/stderr.log b/tests/testsuite/cargo_init/simple_hg/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/simple_hg/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_hg/stderr.term.svg b/tests/testsuite/cargo_init/simple_hg/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_hg/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs index b198fac5314..ad1d282cef9 100644 --- a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs +++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.term.svg b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/simple_lib/mod.rs b/tests/testsuite/cargo_init/simple_lib/mod.rs index 03d367eec6b..8018acd3607 100644 --- a/tests/testsuite/cargo_init/simple_lib/mod.rs +++ b/tests/testsuite/cargo_init/simple_lib/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".gitignore").is_file()); diff --git a/tests/testsuite/cargo_init/simple_lib/stderr.log b/tests/testsuite/cargo_init/simple_lib/stderr.log deleted file mode 100644 index 2411ca5227c..00000000000 --- a/tests/testsuite/cargo_init/simple_lib/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_lib/stderr.term.svg b/tests/testsuite/cargo_init/simple_lib/stderr.term.svg new file mode 100644 index 00000000000..02cb0bb5d63 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_lib/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/unknown_flags/mod.rs b/tests/testsuite/cargo_init/unknown_flags/mod.rs index c283bf25276..9c270902b11 100644 --- a/tests/testsuite/cargo_init/unknown_flags/mod.rs +++ b/tests/testsuite/cargo_init/unknown_flags/mod.rs @@ -11,5 +11,5 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_init/unknown_flags/stderr.log b/tests/testsuite/cargo_init/unknown_flags/stderr.log deleted file mode 100644 index 04a3c3ff0d5..00000000000 --- a/tests/testsuite/cargo_init/unknown_flags/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: unexpected argument '--flag' found - - tip: to pass '--flag' as a value, use '-- --flag' - -Usage: cargo[EXE] init - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_init/unknown_flags/stderr.term.svg b/tests/testsuite/cargo_init/unknown_flags/stderr.term.svg new file mode 100644 index 00000000000..6b3250d8c22 --- /dev/null +++ b/tests/testsuite/cargo_init/unknown_flags/stderr.term.svg @@ -0,0 +1,42 @@ + + + + + + + error: unexpected argument '--flag' found + + + + tip: to pass '--flag' as a value, use '-- --flag' + + + + Usage: cargo[EXE] init <PATH> + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_init/with_argument/mod.rs b/tests/testsuite/cargo_init/with_argument/mod.rs index fe24473f8ff..ccd539cfd38 100644 --- a/tests/testsuite/cargo_init/with_argument/mod.rs +++ b/tests/testsuite/cargo_init/with_argument/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/with_argument/stderr.log b/tests/testsuite/cargo_init/with_argument/stderr.log deleted file mode 100644 index 9458b027266..00000000000 --- a/tests/testsuite/cargo_init/with_argument/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/with_argument/stderr.term.svg b/tests/testsuite/cargo_init/with_argument/stderr.term.svg new file mode 100644 index 00000000000..9e59a1707ec --- /dev/null +++ b/tests/testsuite/cargo_init/with_argument/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_init/workspace_add_member/mod.rs b/tests/testsuite/cargo_init/workspace_add_member/mod.rs index 23929f9436c..968b3ae33bc 100644 --- a/tests/testsuite/cargo_init/workspace_add_member/mod.rs +++ b/tests/testsuite/cargo_init/workspace_add_member/mod.rs @@ -16,7 +16,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_init/workspace_add_member/stderr.log b/tests/testsuite/cargo_init/workspace_add_member/stderr.log deleted file mode 100644 index f8e6cce46ea..00000000000 --- a/tests/testsuite/cargo_init/workspace_add_member/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/workspace_add_member/stderr.term.svg b/tests/testsuite/cargo_init/workspace_add_member/stderr.term.svg new file mode 100644 index 00000000000..7c679509b81 --- /dev/null +++ b/tests/testsuite/cargo_init/workspace_add_member/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Creating binary (application) package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_install/help/mod.rs b/tests/testsuite/cargo_install/help/mod.rs index 9aa299efdc7..b45265efe41 100644 --- a/tests/testsuite/cargo_install/help/mod.rs +++ b/tests/testsuite/cargo_install/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_install/help/stdout.log b/tests/testsuite/cargo_install/help/stdout.log deleted file mode 100644 index 5f072564680..00000000000 --- a/tests/testsuite/cargo_install/help/stdout.log +++ /dev/null @@ -1,56 +0,0 @@ -Install a Rust binary - -Usage: cargo[EXE] install [OPTIONS] [CRATE[@]]... - -Arguments: - [CRATE[@]]... Select the package from the given source - -Options: - --version Specify a version to install - --index Registry index to install from - --registry Registry to use - --git Git URL to install the specified crate from - --branch Branch to use when installing from git - --tag Tag to use when installing from git - --rev Specific commit to use when installing from git - --path Filesystem path to local crate to install from - --root Directory to install packages into - -f, --force Force overwriting existing crates or binaries - --no-track Do not save tracking information - --list List all installed packages and their versions - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - --debug Build in debug mode (with the 'dev' profile) instead of release mode - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Target Selection: - --bin [] Install only the specified binary - --bins Install all binaries - --example [] Install only the specified example - --examples Install all examples - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - --profile Install artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help install` for more detailed information. diff --git a/tests/testsuite/cargo_install/help/stdout.term.svg b/tests/testsuite/cargo_install/help/stdout.term.svg new file mode 100644 index 00000000000..5fac4877432 --- /dev/null +++ b/tests/testsuite/cargo_install/help/stdout.term.svg @@ -0,0 +1,138 @@ + + + + + + + Install a Rust binary + + + + Usage: cargo[EXE] install [OPTIONS] [CRATE[@<VER>]]... + + + + Arguments: + + [CRATE[@<VER>]]... Select the package from the given source + + + + Options: + + --version <VERSION> Specify a version to install + + --index <INDEX> Registry index to install from + + --registry <REGISTRY> Registry to use + + --git <URL> Git URL to install the specified crate from + + --branch <BRANCH> Branch to use when installing from git + + --tag <TAG> Tag to use when installing from git + + --rev <SHA> Specific commit to use when installing from git + + --path <PATH> Filesystem path to local crate to install from + + --root <DIR> Directory to install packages into + + -f, --force Force overwriting existing crates or binaries + + --no-track Do not save tracking information + + --list List all installed packages and their versions + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + --debug Build in debug mode (with the 'dev' profile) instead of release mode + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Target Selection: + + --bin [<NAME>] Install only the specified binary + + --bins Install all binaries + + --example [<NAME>] Install only the specified example + + --examples Install all examples + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + --profile <PROFILE-NAME> Install artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help install` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_locate_project/help/mod.rs b/tests/testsuite/cargo_locate_project/help/mod.rs index 7c9a7b39dfb..b3a2492a8f0 100644 --- a/tests/testsuite/cargo_locate_project/help/mod.rs +++ b/tests/testsuite/cargo_locate_project/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_locate_project/help/stdout.log b/tests/testsuite/cargo_locate_project/help/stdout.log deleted file mode 100644 index f39d61b7aa6..00000000000 --- a/tests/testsuite/cargo_locate_project/help/stdout.log +++ /dev/null @@ -1,22 +0,0 @@ -Print a JSON representation of a Cargo.toml file's location - -Usage: cargo[EXE] locate-project [OPTIONS] - -Options: - --workspace Locate Cargo.toml of the workspace root - --message-format Output representation [possible values: json, plain] - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help locate-project` for more detailed information. diff --git a/tests/testsuite/cargo_locate_project/help/stdout.term.svg b/tests/testsuite/cargo_locate_project/help/stdout.term.svg new file mode 100644 index 00000000000..f5b3d3e42a3 --- /dev/null +++ b/tests/testsuite/cargo_locate_project/help/stdout.term.svg @@ -0,0 +1,70 @@ + + + + + + + Print a JSON representation of a Cargo.toml file's location + + + + Usage: cargo[EXE] locate-project [OPTIONS] + + + + Options: + + --workspace Locate Cargo.toml of the workspace root + + --message-format <FMT> Output representation [possible values: json, plain] + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help locate-project` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_login/help/mod.rs b/tests/testsuite/cargo_login/help/mod.rs index 94dfbb4f6ab..383058118fb 100644 --- a/tests/testsuite/cargo_login/help/mod.rs +++ b/tests/testsuite/cargo_login/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_login/help/stdout.log b/tests/testsuite/cargo_login/help/stdout.log deleted file mode 100644 index 0a699f72f6b..00000000000 --- a/tests/testsuite/cargo_login/help/stdout.log +++ /dev/null @@ -1,23 +0,0 @@ -Log in to a registry. - -Usage: cargo[EXE] login [OPTIONS] [TOKEN] [-- [args]...] - -Arguments: - [TOKEN] - [args]... Additional arguments for the credential provider - -Options: - --registry Registry to use - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help login` for more detailed information. diff --git a/tests/testsuite/cargo_login/help/stdout.term.svg b/tests/testsuite/cargo_login/help/stdout.term.svg new file mode 100644 index 00000000000..5895c094888 --- /dev/null +++ b/tests/testsuite/cargo_login/help/stdout.term.svg @@ -0,0 +1,72 @@ + + + + + + + Log in to a registry. + + + + Usage: cargo[EXE] login [OPTIONS] [TOKEN] [-- [args]...] + + + + Arguments: + + [TOKEN] + + [args]... Additional arguments for the credential provider + + + + Options: + + --registry <REGISTRY> Registry to use + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help login` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_logout/help/mod.rs b/tests/testsuite/cargo_logout/help/mod.rs index 76c643a1f8b..440983d8932 100644 --- a/tests/testsuite/cargo_logout/help/mod.rs +++ b/tests/testsuite/cargo_logout/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_logout/help/stdout.log b/tests/testsuite/cargo_logout/help/stdout.log deleted file mode 100644 index 3f9679f9ba7..00000000000 --- a/tests/testsuite/cargo_logout/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Remove an API token from the registry locally - -Usage: cargo[EXE] logout [OPTIONS] - -Options: - --registry Registry to use - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help logout` for more detailed information. diff --git a/tests/testsuite/cargo_logout/help/stdout.term.svg b/tests/testsuite/cargo_logout/help/stdout.term.svg new file mode 100644 index 00000000000..887a66718a5 --- /dev/null +++ b/tests/testsuite/cargo_logout/help/stdout.term.svg @@ -0,0 +1,64 @@ + + + + + + + Remove an API token from the registry locally + + + + Usage: cargo[EXE] logout [OPTIONS] + + + + Options: + + --registry <REGISTRY> Registry to use + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help logout` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_metadata/help/mod.rs b/tests/testsuite/cargo_metadata/help/mod.rs index fe43d355753..03e2f9d0684 100644 --- a/tests/testsuite/cargo_metadata/help/mod.rs +++ b/tests/testsuite/cargo_metadata/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_metadata/help/stdout.log b/tests/testsuite/cargo_metadata/help/stdout.log deleted file mode 100644 index f44f66c8875..00000000000 --- a/tests/testsuite/cargo_metadata/help/stdout.log +++ /dev/null @@ -1,30 +0,0 @@ -Output the resolved dependencies of a package, the concrete used versions including overrides, in -machine-readable format - -Usage: cargo[EXE] metadata [OPTIONS] - -Options: - --filter-platform Only include resolve dependencies matching the given target-triple - --no-deps Output information only about the workspace members and don't - fetch dependencies - --format-version Format version [possible values: 1] - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help metadata` for more detailed information. diff --git a/tests/testsuite/cargo_metadata/help/stdout.term.svg b/tests/testsuite/cargo_metadata/help/stdout.term.svg new file mode 100644 index 00000000000..f73956e64b6 --- /dev/null +++ b/tests/testsuite/cargo_metadata/help/stdout.term.svg @@ -0,0 +1,86 @@ + + + + + + + Output the resolved dependencies of a package, the concrete used versions including overrides, in + + machine-readable format + + + + Usage: cargo[EXE] metadata [OPTIONS] + + + + Options: + + --filter-platform <TRIPLE> Only include resolve dependencies matching the given target-triple + + --no-deps Output information only about the workspace members and don't + + fetch dependencies + + --format-version <VERSION> Format version [possible values: 1] + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help metadata` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs b/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs index 10f826491e2..7983fed9b2c 100644 --- a/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.log b/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.log deleted file mode 100644 index 0f1529c26cd..00000000000 --- a/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating library `bar` package - Adding `bar` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.term.svg new file mode 100644 index 00000000000..395e46a583b --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Creating library `bar` package + + Adding `bar` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs index 07be1fac7c5..e1057f47a4a 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.log deleted file mode 100644 index 34f20df5596..00000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) `foo` package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.term.svg new file mode 100644 index 00000000000..7381994a3b7 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Creating binary (application) `foo` package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs index 07be1fac7c5..e1057f47a4a 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.log deleted file mode 100644 index 34f20df5596..00000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) `foo` package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.term.svg new file mode 100644 index 00000000000..7381994a3b7 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Creating binary (application) `foo` package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs index bdbb2c894f8..cbb4dec3995 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs @@ -19,7 +19,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.log deleted file mode 100644 index 34f20df5596..00000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) `foo` package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.term.svg new file mode 100644 index 00000000000..7381994a3b7 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Creating binary (application) `foo` package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs index 07be1fac7c5..e1057f47a4a 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.log deleted file mode 100644 index 34f20df5596..00000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) `foo` package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.term.svg new file mode 100644 index 00000000000..7381994a3b7 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Creating binary (application) `foo` package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs index 07be1fac7c5..e1057f47a4a 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.log deleted file mode 100644 index c3053272fb1..00000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.term.svg new file mode 100644 index 00000000000..ab671fb1b39 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs index 07be1fac7c5..e1057f47a4a 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.log deleted file mode 100644 index c3053272fb1..00000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.term.svg new file mode 100644 index 00000000000..ab671fb1b39 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs index 10f826491e2..7983fed9b2c 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.log deleted file mode 100644 index 0f1529c26cd..00000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating library `bar` package - Adding `bar` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.term.svg new file mode 100644 index 00000000000..395e46a583b --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + + Creating library `bar` package + + Adding `bar` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/empty_name/mod.rs b/tests/testsuite/cargo_new/empty_name/mod.rs index 7a3f3164631..9c17fd7e190 100644 --- a/tests/testsuite/cargo_new/empty_name/mod.rs +++ b/tests/testsuite/cargo_new/empty_name/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .failure() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/empty_name/stderr.log b/tests/testsuite/cargo_new/empty_name/stderr.log deleted file mode 100644 index b6368939e3d..00000000000 --- a/tests/testsuite/cargo_new/empty_name/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `` package -error: package name cannot be empty diff --git a/tests/testsuite/cargo_new/empty_name/stderr.term.svg b/tests/testsuite/cargo_new/empty_name/stderr.term.svg new file mode 100644 index 00000000000..766983fd202 --- /dev/null +++ b/tests/testsuite/cargo_new/empty_name/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `` package + + error: package name cannot be empty + + + + + + diff --git a/tests/testsuite/cargo_new/help/mod.rs b/tests/testsuite/cargo_new/help/mod.rs index e283382622d..5283da64bd2 100644 --- a/tests/testsuite/cargo_new/help/mod.rs +++ b/tests/testsuite/cargo_new/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_new/help/stdout.log b/tests/testsuite/cargo_new/help/stdout.log deleted file mode 100644 index 52a6f83a186..00000000000 --- a/tests/testsuite/cargo_new/help/stdout.log +++ /dev/null @@ -1,30 +0,0 @@ -Create a new cargo package at - -Usage: cargo[EXE] new [OPTIONS] - -Arguments: - - -Options: - --vcs Initialize a new repository for the given version control system, - overriding a global configuration. [possible values: git, hg, pijul, - fossil, none] - --bin Use a binary (application) template [default] - --lib Use a library template - --edition Edition to set for the crate generated [possible values: 2015, 2018, - 2021, 2024] - --name Set the resulting package name, defaults to the directory name - --registry Registry to use - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help new` for more detailed information. diff --git a/tests/testsuite/cargo_new/help/stdout.term.svg b/tests/testsuite/cargo_new/help/stdout.term.svg new file mode 100644 index 00000000000..6aae2fb81c2 --- /dev/null +++ b/tests/testsuite/cargo_new/help/stdout.term.svg @@ -0,0 +1,86 @@ + + + + + + + Create a new cargo package at <path> + + + + Usage: cargo[EXE] new [OPTIONS] <PATH> + + + + Arguments: + + <PATH> + + + + Options: + + --vcs <VCS> Initialize a new repository for the given version control system, + + overriding a global configuration. [possible values: git, hg, pijul, + + fossil, none] + + --bin Use a binary (application) template [default] + + --lib Use a library template + + --edition <YEAR> Edition to set for the crate generated [possible values: 2015, 2018, + + 2021, 2024] + + --name <NAME> Set the resulting package name, defaults to the directory name + + --registry <REGISTRY> Registry to use + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help new` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs index 07be1fac7c5..e1057f47a4a 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.log deleted file mode 100644 index c3053272fb1..00000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.term.svg new file mode 100644 index 00000000000..ab671fb1b39 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs index 07be1fac7c5..e1057f47a4a 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.log deleted file mode 100644 index c3053272fb1..00000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.term.svg new file mode 100644 index 00000000000..ab671fb1b39 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs index b9f348f4d85..4db6bab7222 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.log deleted file mode 100644 index c3053272fb1..00000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.term.svg new file mode 100644 index 00000000000..ab671fb1b39 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs index 196b1494235..04bc96f3cc6 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.log deleted file mode 100644 index c3053272fb1..00000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.term.svg new file mode 100644 index 00000000000..ab671fb1b39 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs index 07be1fac7c5..e1057f47a4a 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.log deleted file mode 100644 index c3053272fb1..00000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.term.svg new file mode 100644 index 00000000000..ab671fb1b39 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs index 595425c7e74..ac1eb1063ba 100644 --- a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs +++ b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs @@ -18,7 +18,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log deleted file mode 100644 index e3844ceab3e..00000000000 --- a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `bar` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.term.svg b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.term.svg new file mode 100644 index 00000000000..69da2f0ebac --- /dev/null +++ b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Creating binary (application) `bar` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + diff --git a/tests/testsuite/cargo_owner/help/mod.rs b/tests/testsuite/cargo_owner/help/mod.rs index b5e090aa9ec..e912723ce21 100644 --- a/tests/testsuite/cargo_owner/help/mod.rs +++ b/tests/testsuite/cargo_owner/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_owner/help/stdout.log b/tests/testsuite/cargo_owner/help/stdout.log deleted file mode 100644 index b6f436d047b..00000000000 --- a/tests/testsuite/cargo_owner/help/stdout.log +++ /dev/null @@ -1,27 +0,0 @@ -Manage the owners of a crate on the registry - -Usage: cargo[EXE] owner [OPTIONS] [CRATE] - -Arguments: - [CRATE] - -Options: - -a, --add Name of a user or team to invite as an owner - -r, --remove Name of a user or team to remove as an owner - -l, --list List owners of a crate - --index Registry index URL to modify owners for - --registry Registry to modify owners for - --token API token to use when authenticating - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help owner` for more detailed information. diff --git a/tests/testsuite/cargo_owner/help/stdout.term.svg b/tests/testsuite/cargo_owner/help/stdout.term.svg new file mode 100644 index 00000000000..8b020d35c68 --- /dev/null +++ b/tests/testsuite/cargo_owner/help/stdout.term.svg @@ -0,0 +1,80 @@ + + + + + + + Manage the owners of a crate on the registry + + + + Usage: cargo[EXE] owner [OPTIONS] [CRATE] + + + + Arguments: + + [CRATE] + + + + Options: + + -a, --add <LOGIN> Name of a user or team to invite as an owner + + -r, --remove <LOGIN> Name of a user or team to remove as an owner + + -l, --list List owners of a crate + + --index <INDEX> Registry index URL to modify owners for + + --registry <REGISTRY> Registry to modify owners for + + --token <TOKEN> API token to use when authenticating + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help owner` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_package/help/mod.rs b/tests/testsuite/cargo_package/help/mod.rs index d312165145b..854a5c821fc 100644 --- a/tests/testsuite/cargo_package/help/mod.rs +++ b/tests/testsuite/cargo_package/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_package/help/stdout.log b/tests/testsuite/cargo_package/help/stdout.log deleted file mode 100644 index ec2464a8d63..00000000000 --- a/tests/testsuite/cargo_package/help/stdout.log +++ /dev/null @@ -1,39 +0,0 @@ -Assemble the local package into a distributable tarball - -Usage: cargo[EXE] package [OPTIONS] - -Options: - -l, --list Print files included in a package without making one - --no-verify Don't verify the contents by building them - --no-metadata Ignore warnings about a lack of human-usable metadata - --allow-dirty Allow dirty working directories to be packaged - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package(s) to assemble - --workspace Assemble all packages in the workspace - --exclude Don't assemble specified packages - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help package` for more detailed information. diff --git a/tests/testsuite/cargo_package/help/stdout.term.svg b/tests/testsuite/cargo_package/help/stdout.term.svg new file mode 100644 index 00000000000..76bdb129cdb --- /dev/null +++ b/tests/testsuite/cargo_package/help/stdout.term.svg @@ -0,0 +1,104 @@ + + + + + + + Assemble the local package into a distributable tarball + + + + Usage: cargo[EXE] package [OPTIONS] + + + + Options: + + -l, --list Print files included in a package without making one + + --no-verify Don't verify the contents by building them + + --no-metadata Ignore warnings about a lack of human-usable metadata + + --allow-dirty Allow dirty working directories to be packaged + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package(s) to assemble + + --workspace Assemble all packages in the workspace + + --exclude <SPEC> Don't assemble specified packages + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help package` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_pkgid/help/mod.rs b/tests/testsuite/cargo_pkgid/help/mod.rs index a7d3dd41289..88ff147cac2 100644 --- a/tests/testsuite/cargo_pkgid/help/mod.rs +++ b/tests/testsuite/cargo_pkgid/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_pkgid/help/stdout.log b/tests/testsuite/cargo_pkgid/help/stdout.log deleted file mode 100644 index 657bb9e5db2..00000000000 --- a/tests/testsuite/cargo_pkgid/help/stdout.log +++ /dev/null @@ -1,25 +0,0 @@ -Print a fully qualified package specification - -Usage: cargo[EXE] pkgid [OPTIONS] [SPEC] - -Arguments: - [SPEC] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Argument to get the package ID specifier for - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help pkgid` for more detailed information. diff --git a/tests/testsuite/cargo_pkgid/help/stdout.term.svg b/tests/testsuite/cargo_pkgid/help/stdout.term.svg new file mode 100644 index 00000000000..49fc6abff86 --- /dev/null +++ b/tests/testsuite/cargo_pkgid/help/stdout.term.svg @@ -0,0 +1,76 @@ + + + + + + + Print a fully qualified package specification + + + + Usage: cargo[EXE] pkgid [OPTIONS] [SPEC] + + + + Arguments: + + [SPEC] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Argument to get the package ID specifier for + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help pkgid` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_publish/help/mod.rs b/tests/testsuite/cargo_publish/help/mod.rs index 82b05e5dfa0..c2687c81946 100644 --- a/tests/testsuite/cargo_publish/help/mod.rs +++ b/tests/testsuite/cargo_publish/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_publish/help/stdout.log b/tests/testsuite/cargo_publish/help/stdout.log deleted file mode 100644 index d598c93d681..00000000000 --- a/tests/testsuite/cargo_publish/help/stdout.log +++ /dev/null @@ -1,39 +0,0 @@ -Upload a package to the registry - -Usage: cargo[EXE] publish [OPTIONS] - -Options: - -n, --dry-run Perform all checks without uploading - --index Registry index URL to upload the package to - --registry Registry to upload the package to - --token Token to use when uploading - --no-verify Don't verify the contents by building them - --allow-dirty Allow dirty working directories to be packaged - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package to publish - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help publish` for more detailed information. diff --git a/tests/testsuite/cargo_publish/help/stdout.term.svg b/tests/testsuite/cargo_publish/help/stdout.term.svg new file mode 100644 index 00000000000..88121b60272 --- /dev/null +++ b/tests/testsuite/cargo_publish/help/stdout.term.svg @@ -0,0 +1,104 @@ + + + + + + + Upload a package to the registry + + + + Usage: cargo[EXE] publish [OPTIONS] + + + + Options: + + -n, --dry-run Perform all checks without uploading + + --index <INDEX> Registry index URL to upload the package to + + --registry <REGISTRY> Registry to upload the package to + + --token <TOKEN> Token to use when uploading + + --no-verify Don't verify the contents by building them + + --allow-dirty Allow dirty working directories to be packaged + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to publish + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help publish` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_read_manifest/help/mod.rs b/tests/testsuite/cargo_read_manifest/help/mod.rs index 5f66aed3a74..053be9c82da 100644 --- a/tests/testsuite/cargo_read_manifest/help/mod.rs +++ b/tests/testsuite/cargo_read_manifest/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_read_manifest/help/stdout.log b/tests/testsuite/cargo_read_manifest/help/stdout.log deleted file mode 100644 index a645ea3c2b4..00000000000 --- a/tests/testsuite/cargo_read_manifest/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Print a JSON representation of a Cargo.toml manifest. - -Deprecated, use `cargo metadata --no-deps` instead. - -Usage: cargo[EXE] read-manifest [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network diff --git a/tests/testsuite/cargo_read_manifest/help/stdout.term.svg b/tests/testsuite/cargo_read_manifest/help/stdout.term.svg new file mode 100644 index 00000000000..bc2f56b7d8c --- /dev/null +++ b/tests/testsuite/cargo_read_manifest/help/stdout.term.svg @@ -0,0 +1,64 @@ + + + + + + + Print a JSON representation of a Cargo.toml manifest. + + + + Deprecated, use `cargo metadata --no-deps` instead. + + + + Usage: cargo[EXE] read-manifest [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + + + diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs index 52dd9dadf76..552e404ee4b 100644 --- a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs +++ b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.log b/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.log deleted file mode 100644 index 486ef359fe2..00000000000 --- a/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing clippy from dependencies diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.term.svg b/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.term.svg new file mode 100644 index 00000000000..8401aa0cb88 --- /dev/null +++ b/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing clippy from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/build/mod.rs b/tests/testsuite/cargo_remove/build/mod.rs index 036c96c2645..e61886910ba 100644 --- a/tests/testsuite/cargo_remove/build/mod.rs +++ b/tests/testsuite/cargo_remove/build/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/build/stderr.log b/tests/testsuite/cargo_remove/build/stderr.log deleted file mode 100644 index a51bea48c9e..00000000000 --- a/tests/testsuite/cargo_remove/build/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies diff --git a/tests/testsuite/cargo_remove/build/stderr.term.svg b/tests/testsuite/cargo_remove/build/stderr.term.svg new file mode 100644 index 00000000000..74f8fd1963e --- /dev/null +++ b/tests/testsuite/cargo_remove/build/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing semver from build-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/dev/mod.rs b/tests/testsuite/cargo_remove/dev/mod.rs index 6d603014728..1104a45767a 100644 --- a/tests/testsuite/cargo_remove/dev/mod.rs +++ b/tests/testsuite/cargo_remove/dev/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/dev/stderr.log b/tests/testsuite/cargo_remove/dev/stderr.log deleted file mode 100644 index ccabdb193d4..00000000000 --- a/tests/testsuite/cargo_remove/dev/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing regex from dev-dependencies diff --git a/tests/testsuite/cargo_remove/dev/stderr.term.svg b/tests/testsuite/cargo_remove/dev/stderr.term.svg new file mode 100644 index 00000000000..288a3de6470 --- /dev/null +++ b/tests/testsuite/cargo_remove/dev/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing regex from dev-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/dry_run/mod.rs b/tests/testsuite/cargo_remove/dry_run/mod.rs index ea6b962bd4a..b3e01dabed5 100644 --- a/tests/testsuite/cargo_remove/dry_run/mod.rs +++ b/tests/testsuite/cargo_remove/dry_run/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/dry_run/stderr.log b/tests/testsuite/cargo_remove/dry_run/stderr.log deleted file mode 100644 index 8b118911c61..00000000000 --- a/tests/testsuite/cargo_remove/dry_run/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing semver from dependencies -warning: aborting remove due to dry run diff --git a/tests/testsuite/cargo_remove/dry_run/stderr.term.svg b/tests/testsuite/cargo_remove/dry_run/stderr.term.svg new file mode 100644 index 00000000000..63bbdbbb46d --- /dev/null +++ b/tests/testsuite/cargo_remove/dry_run/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Removing semver from dependencies + + warning: aborting remove due to dry run + + + + + + diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs index e1f62987a90..f18c150fa4b 100644 --- a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs +++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs @@ -23,7 +23,7 @@ fn case() { .assert() .code(0) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.log b/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.log deleted file mode 100644 index b4377b3a4b5..00000000000 --- a/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing serde_derive from dependencies diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.term.svg b/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.term.svg new file mode 100644 index 00000000000..be65cfcd741 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing serde_derive from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/gc_patch/mod.rs b/tests/testsuite/cargo_remove/gc_patch/mod.rs index 14c9b42e890..e1fad49e336 100644 --- a/tests/testsuite/cargo_remove/gc_patch/mod.rs +++ b/tests/testsuite/cargo_remove/gc_patch/mod.rs @@ -73,7 +73,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &in_project.root()); } diff --git a/tests/testsuite/cargo_remove/gc_patch/stderr.log b/tests/testsuite/cargo_remove/gc_patch/stderr.log deleted file mode 100644 index ba519ba1b91..00000000000 --- a/tests/testsuite/cargo_remove/gc_patch/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing bar from dependencies diff --git a/tests/testsuite/cargo_remove/gc_patch/stderr.term.svg b/tests/testsuite/cargo_remove/gc_patch/stderr.term.svg new file mode 100644 index 00000000000..154f095e97b --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_patch/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing bar from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/gc_profile/mod.rs b/tests/testsuite/cargo_remove/gc_profile/mod.rs index 3df85c1326c..10601612dcd 100644 --- a/tests/testsuite/cargo_remove/gc_profile/mod.rs +++ b/tests/testsuite/cargo_remove/gc_profile/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_profile/stderr.log b/tests/testsuite/cargo_remove/gc_profile/stderr.log deleted file mode 100644 index 9dee9e2b713..00000000000 --- a/tests/testsuite/cargo_remove/gc_profile/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing toml from dependencies diff --git a/tests/testsuite/cargo_remove/gc_profile/stderr.term.svg b/tests/testsuite/cargo_remove/gc_profile/stderr.term.svg new file mode 100644 index 00000000000..ffefd89a7cc --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_profile/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing toml from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/gc_replace/mod.rs b/tests/testsuite/cargo_remove/gc_replace/mod.rs index abc5715612d..4ea4377ad37 100644 --- a/tests/testsuite/cargo_remove/gc_replace/mod.rs +++ b/tests/testsuite/cargo_remove/gc_replace/mod.rs @@ -32,7 +32,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_replace/stderr.log b/tests/testsuite/cargo_remove/gc_replace/stderr.log deleted file mode 100644 index 9dee9e2b713..00000000000 --- a/tests/testsuite/cargo_remove/gc_replace/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing toml from dependencies diff --git a/tests/testsuite/cargo_remove/gc_replace/stderr.term.svg b/tests/testsuite/cargo_remove/gc_replace/stderr.term.svg new file mode 100644 index 00000000000..ffefd89a7cc --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_replace/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing toml from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/help/mod.rs b/tests/testsuite/cargo_remove/help/mod.rs index 915b4cd5f05..9c87ea04672 100644 --- a/tests/testsuite/cargo_remove/help/mod.rs +++ b/tests/testsuite/cargo_remove/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_remove/help/stdout.log b/tests/testsuite/cargo_remove/help/stdout.log deleted file mode 100644 index c3dc74b2da6..00000000000 --- a/tests/testsuite/cargo_remove/help/stdout.log +++ /dev/null @@ -1,31 +0,0 @@ -Remove dependencies from a Cargo.toml manifest file - -Usage: cargo[EXE] remove [OPTIONS] ... - -Arguments: - ... Dependencies to be removed - -Options: - -n, --dry-run Don't actually write the manifest - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Section: - --dev Remove from dev-dependencies - --build Remove from build-dependencies - --target Remove from target-dependencies - -Package Selection: - -p, --package [] Package to remove from - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help remove` for more detailed information. diff --git a/tests/testsuite/cargo_remove/help/stdout.term.svg b/tests/testsuite/cargo_remove/help/stdout.term.svg new file mode 100644 index 00000000000..6499abed14f --- /dev/null +++ b/tests/testsuite/cargo_remove/help/stdout.term.svg @@ -0,0 +1,88 @@ + + + + + + + Remove dependencies from a Cargo.toml manifest file + + + + Usage: cargo[EXE] remove [OPTIONS] <DEP_ID>... + + + + Arguments: + + <DEP_ID>... Dependencies to be removed + + + + Options: + + -n, --dry-run Don't actually write the manifest + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Section: + + --dev Remove from dev-dependencies + + --build Remove from build-dependencies + + --target <TARGET> Remove from target-dependencies + + + + Package Selection: + + -p, --package [<SPEC>] Package to remove from + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help remove` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_arg/mod.rs b/tests/testsuite/cargo_remove/invalid_arg/mod.rs index 9a78cba93c7..70c3d0f2eb7 100644 --- a/tests/testsuite/cargo_remove/invalid_arg/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_arg/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_arg/stderr.log b/tests/testsuite/cargo_remove/invalid_arg/stderr.log deleted file mode 100644 index ac5f3cfd175..00000000000 --- a/tests/testsuite/cargo_remove/invalid_arg/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: unexpected argument '--flag' found - - tip: to pass '--flag' as a value, use '-- --flag' - -Usage: cargo[EXE] remove ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_remove/invalid_arg/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_arg/stderr.term.svg new file mode 100644 index 00000000000..ad026d69ab1 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_arg/stderr.term.svg @@ -0,0 +1,42 @@ + + + + + + + error: unexpected argument '--flag' found + + + + tip: to pass '--flag' as a value, use '-- --flag' + + + + Usage: cargo[EXE] remove <DEP_ID>... + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_dep/mod.rs index 479ca91e2ad..13b266f02ac 100644 --- a/tests/testsuite/cargo_remove/invalid_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_dep/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_dep/stderr.log b/tests/testsuite/cargo_remove/invalid_dep/stderr.log deleted file mode 100644 index 9bb137d1f46..00000000000 --- a/tests/testsuite/cargo_remove/invalid_dep/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing invalid_dependency_name from dependencies -error: the dependency `invalid_dependency_name` could not be found in `dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_dep/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_dep/stderr.term.svg new file mode 100644 index 00000000000..3b7fb2b807d --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_dep/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Removing invalid_dependency_name from dependencies + + error: the dependency `invalid_dependency_name` could not be found in `dependencies` + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_package/mod.rs b/tests/testsuite/cargo_remove/invalid_package/mod.rs index f7332a4f048..dfcc8c2508d 100644 --- a/tests/testsuite/cargo_remove/invalid_package/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_package/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_package/stderr.log b/tests/testsuite/cargo_remove/invalid_package/stderr.log deleted file mode 100644 index 683512ca007..00000000000 --- a/tests/testsuite/cargo_remove/invalid_package/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: package(s) `dep-c` not found in workspace `[ROOT]/case` diff --git a/tests/testsuite/cargo_remove/invalid_package/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_package/stderr.term.svg new file mode 100644 index 00000000000..8123f8668e1 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_package/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + error: package(s) `dep-c` not found in workspace `[ROOT]/case` + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs index 9f03a085b37..efedd118b98 100644 --- a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.log b/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.log deleted file mode 100644 index 8a03c9e5b05..00000000000 --- a/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ -error: `cargo remove` could not determine which package to modify. Use the `--package` option to specify a package. -available packages: dep-a, dep-b diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.term.svg new file mode 100644 index 00000000000..ea4a500c55b --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + error: `cargo remove` could not determine which package to modify. Use the `--package` option to specify a package. + + available packages: dep-a, dep-b + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_section/mod.rs b/tests/testsuite/cargo_remove/invalid_section/mod.rs index eb3c2894212..6364852afa6 100644 --- a/tests/testsuite/cargo_remove/invalid_section/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_section/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_section/stderr.log b/tests/testsuite/cargo_remove/invalid_section/stderr.log deleted file mode 100644 index 8cbafa98e1a..00000000000 --- a/tests/testsuite/cargo_remove/invalid_section/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing docopt from build-dependencies -error: the dependency `docopt` could not be found in `build-dependencies`; it is present in `dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_section/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_section/stderr.term.svg new file mode 100644 index 00000000000..0166b18c22e --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_section/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Removing docopt from build-dependencies + + error: the dependency `docopt` could not be found in `build-dependencies`; it is present in `dependencies` + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs index 69f6151fb6f..f808a8cdf7b 100644 --- a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/stderr.log b/tests/testsuite/cargo_remove/invalid_section_dep/stderr.log deleted file mode 100644 index 60c0f8b41a2..00000000000 --- a/tests/testsuite/cargo_remove/invalid_section_dep/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing semver from dev-dependencies -error: the dependency `semver` could not be found in `dev-dependencies`; it is present in `dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_section_dep/stderr.term.svg new file mode 100644 index 00000000000..2f08d61b4f5 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_section_dep/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Removing semver from dev-dependencies + + error: the dependency `semver` could not be found in `dev-dependencies`; it is present in `dependencies` + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_target/mod.rs b/tests/testsuite/cargo_remove/invalid_target/mod.rs index 2d5742e38e1..aedb0827b75 100644 --- a/tests/testsuite/cargo_remove/invalid_target/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_target/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_target/stderr.log b/tests/testsuite/cargo_remove/invalid_target/stderr.log deleted file mode 100644 index eae9f788762..00000000000 --- a/tests/testsuite/cargo_remove/invalid_target/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing dbus from dependencies for target `powerpc-unknown-linux-gnu` -error: the dependency `dbus` could not be found in `target.powerpc-unknown-linux-gnu.dependencies`; it is present in `target.x86_64-unknown-linux-gnu.dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_target/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_target/stderr.term.svg new file mode 100644 index 00000000000..c3383ff1b90 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_target/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Removing dbus from dependencies for target `powerpc-unknown-linux-gnu` + + error: the dependency `dbus` could not be found in `target.powerpc-unknown-linux-gnu.dependencies`; it is present in `target.x86_64-unknown-linux-gnu.dependencies` + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs index f70225470f2..846975ef1ed 100644 --- a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/stderr.log b/tests/testsuite/cargo_remove/invalid_target_dep/stderr.log deleted file mode 100644 index 635a7bd6c8f..00000000000 --- a/tests/testsuite/cargo_remove/invalid_target_dep/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing toml from dependencies for target `x86_64-unknown-linux-gnu` -error: the dependency `toml` could not be found in `target.x86_64-unknown-linux-gnu.dependencies`; it is present in `dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_target_dep/stderr.term.svg new file mode 100644 index 00000000000..1613c71bcc5 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_target_dep/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + + Removing toml from dependencies for target `x86_64-unknown-linux-gnu` + + error: the dependency `toml` could not be found in `target.x86_64-unknown-linux-gnu.dependencies`; it is present in `dependencies` + + + + + + diff --git a/tests/testsuite/cargo_remove/multiple_deps/mod.rs b/tests/testsuite/cargo_remove/multiple_deps/mod.rs index 60ec40559be..68b4b88fb79 100644 --- a/tests/testsuite/cargo_remove/multiple_deps/mod.rs +++ b/tests/testsuite/cargo_remove/multiple_deps/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/multiple_deps/stderr.log b/tests/testsuite/cargo_remove/multiple_deps/stderr.log deleted file mode 100644 index 111b1e94acd..00000000000 --- a/tests/testsuite/cargo_remove/multiple_deps/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing docopt from dependencies - Removing semver from dependencies diff --git a/tests/testsuite/cargo_remove/multiple_deps/stderr.term.svg b/tests/testsuite/cargo_remove/multiple_deps/stderr.term.svg new file mode 100644 index 00000000000..475ef4293c4 --- /dev/null +++ b/tests/testsuite/cargo_remove/multiple_deps/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Removing docopt from dependencies + + Removing semver from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/multiple_dev/mod.rs b/tests/testsuite/cargo_remove/multiple_dev/mod.rs index 4f7fe93c670..ac38f36a540 100644 --- a/tests/testsuite/cargo_remove/multiple_dev/mod.rs +++ b/tests/testsuite/cargo_remove/multiple_dev/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/multiple_dev/stderr.log b/tests/testsuite/cargo_remove/multiple_dev/stderr.log deleted file mode 100644 index 8a69c94f55c..00000000000 --- a/tests/testsuite/cargo_remove/multiple_dev/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing regex from dev-dependencies - Removing serde from dev-dependencies diff --git a/tests/testsuite/cargo_remove/multiple_dev/stderr.term.svg b/tests/testsuite/cargo_remove/multiple_dev/stderr.term.svg new file mode 100644 index 00000000000..b385a9cef13 --- /dev/null +++ b/tests/testsuite/cargo_remove/multiple_dev/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Removing regex from dev-dependencies + + Removing serde from dev-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/no_arg/mod.rs b/tests/testsuite/cargo_remove/no_arg/mod.rs index f0a3b82c8c9..c0c77766097 100644 --- a/tests/testsuite/cargo_remove/no_arg/mod.rs +++ b/tests/testsuite/cargo_remove/no_arg/mod.rs @@ -30,7 +30,7 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/no_arg/stderr.log b/tests/testsuite/cargo_remove/no_arg/stderr.log deleted file mode 100644 index 54fa9f42405..00000000000 --- a/tests/testsuite/cargo_remove/no_arg/stderr.log +++ /dev/null @@ -1,6 +0,0 @@ -error: the following required arguments were not provided: - ... - -Usage: cargo[EXE] remove ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_remove/no_arg/stderr.term.svg b/tests/testsuite/cargo_remove/no_arg/stderr.term.svg new file mode 100644 index 00000000000..d4e40e35116 --- /dev/null +++ b/tests/testsuite/cargo_remove/no_arg/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + + error: the following required arguments were not provided: + + <DEP_ID>... + + + + Usage: cargo[EXE] remove <DEP_ID>... + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_remove/offline/mod.rs b/tests/testsuite/cargo_remove/offline/mod.rs index 62b57ae70c4..ea75c66f0e7 100644 --- a/tests/testsuite/cargo_remove/offline/mod.rs +++ b/tests/testsuite/cargo_remove/offline/mod.rs @@ -38,7 +38,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/offline/stderr.log b/tests/testsuite/cargo_remove/offline/stderr.log deleted file mode 100644 index 7083976b17d..00000000000 --- a/tests/testsuite/cargo_remove/offline/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing docopt from dependencies diff --git a/tests/testsuite/cargo_remove/offline/stderr.term.svg b/tests/testsuite/cargo_remove/offline/stderr.term.svg new file mode 100644 index 00000000000..51bcb0f99a9 --- /dev/null +++ b/tests/testsuite/cargo_remove/offline/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing docopt from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs index e7b774ea112..b85ef13b7ae 100644 --- a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs +++ b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/stderr.log b/tests/testsuite/cargo_remove/optional_dep_feature/stderr.log deleted file mode 100644 index d3656ec540e..00000000000 --- a/tests/testsuite/cargo_remove/optional_dep_feature/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing serde from dev-dependencies diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/stderr.term.svg b/tests/testsuite/cargo_remove/optional_dep_feature/stderr.term.svg new file mode 100644 index 00000000000..725449dd6d5 --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_dep_feature/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing serde from dev-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs index 41a419a2065..421ec788d68 100644 --- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs +++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.log b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.log deleted file mode 100644 index 7bceb0f9445..00000000000 --- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing docopt from dependencies - Removing toml from dependencies diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.term.svg b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.term.svg new file mode 100644 index 00000000000..d3aeb2410fe --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Removing docopt from dependencies + + Removing toml from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/optional_feature/mod.rs b/tests/testsuite/cargo_remove/optional_feature/mod.rs index e1cf95e7cc5..9fe043486df 100644 --- a/tests/testsuite/cargo_remove/optional_feature/mod.rs +++ b/tests/testsuite/cargo_remove/optional_feature/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_feature/stderr.log b/tests/testsuite/cargo_remove/optional_feature/stderr.log deleted file mode 100644 index ef7354ef183..00000000000 --- a/tests/testsuite/cargo_remove/optional_feature/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from dependencies diff --git a/tests/testsuite/cargo_remove/optional_feature/stderr.term.svg b/tests/testsuite/cargo_remove/optional_feature/stderr.term.svg new file mode 100644 index 00000000000..7ad84cb8915 --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_feature/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing semver from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/package/mod.rs b/tests/testsuite/cargo_remove/package/mod.rs index bb2056cf643..d2e7b2fdbc0 100644 --- a/tests/testsuite/cargo_remove/package/mod.rs +++ b/tests/testsuite/cargo_remove/package/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/package/stderr.log b/tests/testsuite/cargo_remove/package/stderr.log deleted file mode 100644 index 7083976b17d..00000000000 --- a/tests/testsuite/cargo_remove/package/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing docopt from dependencies diff --git a/tests/testsuite/cargo_remove/package/stderr.term.svg b/tests/testsuite/cargo_remove/package/stderr.term.svg new file mode 100644 index 00000000000..51bcb0f99a9 --- /dev/null +++ b/tests/testsuite/cargo_remove/package/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing docopt from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/remove_basic/mod.rs b/tests/testsuite/cargo_remove/remove_basic/mod.rs index f078b093004..a0659cd9149 100644 --- a/tests/testsuite/cargo_remove/remove_basic/mod.rs +++ b/tests/testsuite/cargo_remove/remove_basic/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/remove_basic/stderr.log b/tests/testsuite/cargo_remove/remove_basic/stderr.log deleted file mode 100644 index 7083976b17d..00000000000 --- a/tests/testsuite/cargo_remove/remove_basic/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing docopt from dependencies diff --git a/tests/testsuite/cargo_remove/remove_basic/stderr.term.svg b/tests/testsuite/cargo_remove/remove_basic/stderr.term.svg new file mode 100644 index 00000000000..51bcb0f99a9 --- /dev/null +++ b/tests/testsuite/cargo_remove/remove_basic/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing docopt from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs index 5fc17fad695..c684d8badce 100644 --- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs +++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs @@ -21,7 +21,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.log b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.log deleted file mode 100644 index 9dee9e2b713..00000000000 --- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing toml from dependencies diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.term.svg b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.term.svg new file mode 100644 index 00000000000..ffefd89a7cc --- /dev/null +++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing toml from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/target/mod.rs b/tests/testsuite/cargo_remove/target/mod.rs index 310540c30a4..be7923d869b 100644 --- a/tests/testsuite/cargo_remove/target/mod.rs +++ b/tests/testsuite/cargo_remove/target/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target/stderr.log b/tests/testsuite/cargo_remove/target/stderr.log deleted file mode 100644 index 8fb1b5000b8..00000000000 --- a/tests/testsuite/cargo_remove/target/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing dbus from dependencies for target `x86_64-unknown-linux-gnu` diff --git a/tests/testsuite/cargo_remove/target/stderr.term.svg b/tests/testsuite/cargo_remove/target/stderr.term.svg new file mode 100644 index 00000000000..41fbebd6b25 --- /dev/null +++ b/tests/testsuite/cargo_remove/target/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing dbus from dependencies for target `x86_64-unknown-linux-gnu` + + + + + + diff --git a/tests/testsuite/cargo_remove/target_build/mod.rs b/tests/testsuite/cargo_remove/target_build/mod.rs index c7c6022384b..2f94d85db95 100644 --- a/tests/testsuite/cargo_remove/target_build/mod.rs +++ b/tests/testsuite/cargo_remove/target_build/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target_build/stderr.log b/tests/testsuite/cargo_remove/target_build/stderr.log deleted file mode 100644 index 673a47cebd2..00000000000 --- a/tests/testsuite/cargo_remove/target_build/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies for target `x86_64-unknown-linux-gnu` diff --git a/tests/testsuite/cargo_remove/target_build/stderr.term.svg b/tests/testsuite/cargo_remove/target_build/stderr.term.svg new file mode 100644 index 00000000000..9b4a6a5a588 --- /dev/null +++ b/tests/testsuite/cargo_remove/target_build/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing semver from build-dependencies for target `x86_64-unknown-linux-gnu` + + + + + + diff --git a/tests/testsuite/cargo_remove/target_dev/mod.rs b/tests/testsuite/cargo_remove/target_dev/mod.rs index 29d9607611b..249d382cd64 100644 --- a/tests/testsuite/cargo_remove/target_dev/mod.rs +++ b/tests/testsuite/cargo_remove/target_dev/mod.rs @@ -33,7 +33,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target_dev/stderr.log b/tests/testsuite/cargo_remove/target_dev/stderr.log deleted file mode 100644 index 854aff44a77..00000000000 --- a/tests/testsuite/cargo_remove/target_dev/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing ncurses from dev-dependencies for target `x86_64-unknown-linux-gnu` diff --git a/tests/testsuite/cargo_remove/target_dev/stderr.term.svg b/tests/testsuite/cargo_remove/target_dev/stderr.term.svg new file mode 100644 index 00000000000..f42b56e24ef --- /dev/null +++ b/tests/testsuite/cargo_remove/target_dev/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing ncurses from dev-dependencies for target `x86_64-unknown-linux-gnu` + + + + + + diff --git a/tests/testsuite/cargo_remove/update_lock_file/mod.rs b/tests/testsuite/cargo_remove/update_lock_file/mod.rs index 70200287e90..bbc0a62fb6c 100644 --- a/tests/testsuite/cargo_remove/update_lock_file/mod.rs +++ b/tests/testsuite/cargo_remove/update_lock_file/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/update_lock_file/stderr.log b/tests/testsuite/cargo_remove/update_lock_file/stderr.log deleted file mode 100644 index 1494b0fc579..00000000000 --- a/tests/testsuite/cargo_remove/update_lock_file/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing rustc-serialize from dependencies diff --git a/tests/testsuite/cargo_remove/update_lock_file/stderr.term.svg b/tests/testsuite/cargo_remove/update_lock_file/stderr.term.svg new file mode 100644 index 00000000000..ac8298f8776 --- /dev/null +++ b/tests/testsuite/cargo_remove/update_lock_file/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing rustc-serialize from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/workspace/mod.rs b/tests/testsuite/cargo_remove/workspace/mod.rs index 79ea17b8448..bce633f208f 100644 --- a/tests/testsuite/cargo_remove/workspace/mod.rs +++ b/tests/testsuite/cargo_remove/workspace/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace/stderr.log b/tests/testsuite/cargo_remove/workspace/stderr.log deleted file mode 100644 index a51bea48c9e..00000000000 --- a/tests/testsuite/cargo_remove/workspace/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies diff --git a/tests/testsuite/cargo_remove/workspace/stderr.term.svg b/tests/testsuite/cargo_remove/workspace/stderr.term.svg new file mode 100644 index 00000000000..74f8fd1963e --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing semver from build-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs index 79ea17b8448..bce633f208f 100644 --- a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs +++ b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log b/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log deleted file mode 100644 index a51bea48c9e..00000000000 --- a/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.term.svg b/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.term.svg new file mode 100644 index 00000000000..74f8fd1963e --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing semver from build-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs index 79ea17b8448..bce633f208f 100644 --- a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs +++ b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs @@ -31,7 +31,7 @@ fn case() { .assert() .success() .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace_preserved/stderr.log b/tests/testsuite/cargo_remove/workspace_preserved/stderr.log deleted file mode 100644 index a51bea48c9e..00000000000 --- a/tests/testsuite/cargo_remove/workspace_preserved/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies diff --git a/tests/testsuite/cargo_remove/workspace_preserved/stderr.term.svg b/tests/testsuite/cargo_remove/workspace_preserved/stderr.term.svg new file mode 100644 index 00000000000..74f8fd1963e --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace_preserved/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Removing semver from build-dependencies + + + + + + diff --git a/tests/testsuite/cargo_report/help/mod.rs b/tests/testsuite/cargo_report/help/mod.rs index 3318c1b3d9c..3f7bc9f9f71 100644 --- a/tests/testsuite/cargo_report/help/mod.rs +++ b/tests/testsuite/cargo_report/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_report/help/stdout.log b/tests/testsuite/cargo_report/help/stdout.log deleted file mode 100644 index 95872662ef5..00000000000 --- a/tests/testsuite/cargo_report/help/stdout.log +++ /dev/null @@ -1,21 +0,0 @@ -Generate and display various kinds of reports - -Usage: cargo[EXE] report [OPTIONS] - -Commands: - future-incompatibilities Reports any crates which will eventually stop compiling - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help report` for more detailed information. diff --git a/tests/testsuite/cargo_report/help/stdout.term.svg b/tests/testsuite/cargo_report/help/stdout.term.svg new file mode 100644 index 00000000000..81fa7aff98d --- /dev/null +++ b/tests/testsuite/cargo_report/help/stdout.term.svg @@ -0,0 +1,68 @@ + + + + + + + Generate and display various kinds of reports + + + + Usage: cargo[EXE] report [OPTIONS] <COMMAND> + + + + Commands: + + future-incompatibilities Reports any crates which will eventually stop compiling + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help report` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_run/help/mod.rs b/tests/testsuite/cargo_run/help/mod.rs index d7ce006002e..7f0ff7ec489 100644 --- a/tests/testsuite/cargo_run/help/mod.rs +++ b/tests/testsuite/cargo_run/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_run/help/stdout.log b/tests/testsuite/cargo_run/help/stdout.log deleted file mode 100644 index 2e39d4f9ebd..00000000000 --- a/tests/testsuite/cargo_run/help/stdout.log +++ /dev/null @@ -1,47 +0,0 @@ -Run a binary or example of the local package - -Usage: cargo[EXE] run [OPTIONS] [ARGS]... - -Arguments: - [ARGS]... Arguments for the binary or example to run - -Options: - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package with the target to run - -Target Selection: - --bin [] Name of the bin target to run - --example [] Name of the example target to run - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help run` for more detailed information. diff --git a/tests/testsuite/cargo_run/help/stdout.term.svg b/tests/testsuite/cargo_run/help/stdout.term.svg new file mode 100644 index 00000000000..96f35f4d421 --- /dev/null +++ b/tests/testsuite/cargo_run/help/stdout.term.svg @@ -0,0 +1,120 @@ + + + + + + + Run a binary or example of the local package + + + + Usage: cargo[EXE] run [OPTIONS] [ARGS]... + + + + Arguments: + + [ARGS]... Arguments for the binary or example to run + + + + Options: + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package with the target to run + + + + Target Selection: + + --bin [<NAME>] Name of the bin target to run + + --example [<NAME>] Name of the example target to run + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help run` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_rustc/help/mod.rs b/tests/testsuite/cargo_rustc/help/mod.rs index 921b48100d4..5d032da520d 100644 --- a/tests/testsuite/cargo_rustc/help/mod.rs +++ b/tests/testsuite/cargo_rustc/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_rustc/help/stdout.log b/tests/testsuite/cargo_rustc/help/stdout.log deleted file mode 100644 index 8952330b032..00000000000 --- a/tests/testsuite/cargo_rustc/help/stdout.log +++ /dev/null @@ -1,58 +0,0 @@ -Compile a package, and pass extra options to the compiler - -Usage: cargo[EXE] rustc [OPTIONS] [ARGS]... - -Arguments: - [ARGS]... Extra rustc flags - -Options: - --print Output compiler information without compiling - --crate-type Comma separated list of types of crates for the compiler to emit - --future-incompat-report Outputs a future incompatibility report at the end of the build - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to build - -Target Selection: - --lib Build only this package's library - --bins Build all binaries - --bin [] Build only the specified binary - --examples Build all examples - --example [] Build only the specified example - --tests Build all test targets - --test [] Build only the specified test target - --benches Build all bench targets - --bench [] Build only the specified bench target - --all-targets Build all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Target triple which compiles will be for - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help rustc` for more detailed information. diff --git a/tests/testsuite/cargo_rustc/help/stdout.term.svg b/tests/testsuite/cargo_rustc/help/stdout.term.svg new file mode 100644 index 00000000000..e3902ceecdb --- /dev/null +++ b/tests/testsuite/cargo_rustc/help/stdout.term.svg @@ -0,0 +1,142 @@ + + + + + + + Compile a package, and pass extra options to the compiler + + + + Usage: cargo[EXE] rustc [OPTIONS] [ARGS]... + + + + Arguments: + + [ARGS]... Extra rustc flags + + + + Options: + + --print <INFO> Output compiler information without compiling + + --crate-type <CRATE-TYPE> Comma separated list of types of crates for the compiler to emit + + --future-incompat-report Outputs a future incompatibility report at the end of the build + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to build + + + + Target Selection: + + --lib Build only this package's library + + --bins Build all binaries + + --bin [<NAME>] Build only the specified binary + + --examples Build all examples + + --example [<NAME>] Build only the specified example + + --tests Build all test targets + + --test [<NAME>] Build only the specified test target + + --benches Build all bench targets + + --bench [<NAME>] Build only the specified bench target + + --all-targets Build all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Target triple which compiles will be for + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help rustc` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_rustdoc/help/mod.rs b/tests/testsuite/cargo_rustdoc/help/mod.rs index 78d61ae9baa..d04a1bb63e8 100644 --- a/tests/testsuite/cargo_rustdoc/help/mod.rs +++ b/tests/testsuite/cargo_rustdoc/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_rustdoc/help/stdout.log b/tests/testsuite/cargo_rustdoc/help/stdout.log deleted file mode 100644 index 6e0e999178e..00000000000 --- a/tests/testsuite/cargo_rustdoc/help/stdout.log +++ /dev/null @@ -1,57 +0,0 @@ -Build a package's documentation, using specified custom flags. - -Usage: cargo[EXE] rustdoc [OPTIONS] [ARGS]... - -Arguments: - [ARGS]... Extra rustdoc flags - -Options: - --open Opens the docs in a browser after the operation - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - --output-format The output type to write (unstable) [possible values: html, json] - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to document - -Target Selection: - --lib Build only this package's library - --bins Build all binaries - --bin [] Build only the specified binary - --examples Build all examples - --example [] Build only the specified example - --tests Build all test targets - --test [] Build only the specified test target - --benches Build all bench targets - --bench [] Build only the specified bench target - --all-targets Build all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help rustdoc` for more detailed information. diff --git a/tests/testsuite/cargo_rustdoc/help/stdout.term.svg b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg new file mode 100644 index 00000000000..0098268a282 --- /dev/null +++ b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg @@ -0,0 +1,140 @@ + + + + + + + Build a package's documentation, using specified custom flags. + + + + Usage: cargo[EXE] rustdoc [OPTIONS] [ARGS]... + + + + Arguments: + + [ARGS]... Extra rustdoc flags + + + + Options: + + --open Opens the docs in a browser after the operation + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + --output-format <FMT> The output type to write (unstable) [possible values: html, json] + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to document + + + + Target Selection: + + --lib Build only this package's library + + --bins Build all binaries + + --bin [<NAME>] Build only the specified binary + + --examples Build all examples + + --example [<NAME>] Build only the specified example + + --tests Build all test targets + + --test [<NAME>] Build only the specified test target + + --benches Build all bench targets + + --bench [<NAME>] Build only the specified bench target + + --all-targets Build all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help rustdoc` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_search/help/mod.rs b/tests/testsuite/cargo_search/help/mod.rs index d25c9fb8818..2bff19d428e 100644 --- a/tests/testsuite/cargo_search/help/mod.rs +++ b/tests/testsuite/cargo_search/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_search/help/stdout.log b/tests/testsuite/cargo_search/help/stdout.log deleted file mode 100644 index e2024a9903b..00000000000 --- a/tests/testsuite/cargo_search/help/stdout.log +++ /dev/null @@ -1,24 +0,0 @@ -Search packages in the registry. Default registry is crates.io - -Usage: cargo[EXE] search [OPTIONS] [QUERY]... - -Arguments: - [QUERY]... - -Options: - --limit Limit the number of results (default: 10, max: 100) - --index Registry index URL to search packages in - --registry Registry to search packages in - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help search` for more detailed information. diff --git a/tests/testsuite/cargo_search/help/stdout.term.svg b/tests/testsuite/cargo_search/help/stdout.term.svg new file mode 100644 index 00000000000..d8a3f8b393e --- /dev/null +++ b/tests/testsuite/cargo_search/help/stdout.term.svg @@ -0,0 +1,74 @@ + + + + + + + Search packages in the registry. Default registry is crates.io + + + + Usage: cargo[EXE] search [OPTIONS] [QUERY]... + + + + Arguments: + + [QUERY]... + + + + Options: + + --limit <LIMIT> Limit the number of results (default: 10, max: 100) + + --index <INDEX> Registry index URL to search packages in + + --registry <REGISTRY> Registry to search packages in + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help search` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_test/help/mod.rs b/tests/testsuite/cargo_test/help/mod.rs index 978abcd30ad..a9ae044de6e 100644 --- a/tests/testsuite/cargo_test/help/mod.rs +++ b/tests/testsuite/cargo_test/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_test/help/stdout.log b/tests/testsuite/cargo_test/help/stdout.log deleted file mode 100644 index eabfd19bca1..00000000000 --- a/tests/testsuite/cargo_test/help/stdout.log +++ /dev/null @@ -1,63 +0,0 @@ -Execute all unit and integration tests and build examples of a local package - -Usage: cargo[EXE] test [OPTIONS] [TESTNAME] [-- [ARGS]...] - -Arguments: - [TESTNAME] If specified, only run tests containing this string in their names - [ARGS]... Arguments for the test binary - -Options: - --doc Test only this library's documentation - --no-run Compile, but don't run tests - --no-fail-fast Run all tests regardless of failure - --ignore-rust-version Ignore `rust-version` specification in packages - --future-incompat-report Outputs a future incompatibility report at the end of the build - --message-format Error format - -q, --quiet Display one character per test instead of one line - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to run tests for - --workspace Test all packages in the workspace - --exclude Exclude packages from the test - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Test only this package's library - --bins Test all binaries - --bin [] Test only the specified binary - --examples Test all examples - --example [] Test only the specified example - --tests Test all test targets - --test [] Test only the specified test target - --benches Test all bench targets - --bench [] Test only the specified bench target - --all-targets Test all targets (does not include doctests) - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help test` for more detailed information. -Run `cargo test -- --help` for test binary options. diff --git a/tests/testsuite/cargo_test/help/stdout.term.svg b/tests/testsuite/cargo_test/help/stdout.term.svg new file mode 100644 index 00000000000..e2a787895b2 --- /dev/null +++ b/tests/testsuite/cargo_test/help/stdout.term.svg @@ -0,0 +1,152 @@ + + + + + + + Execute all unit and integration tests and build examples of a local package + + + + Usage: cargo[EXE] test [OPTIONS] [TESTNAME] [-- [ARGS]...] + + + + Arguments: + + [TESTNAME] If specified, only run tests containing this string in their names + + [ARGS]... Arguments for the test binary + + + + Options: + + --doc Test only this library's documentation + + --no-run Compile, but don't run tests + + --no-fail-fast Run all tests regardless of failure + + --ignore-rust-version Ignore `rust-version` specification in packages + + --future-incompat-report Outputs a future incompatibility report at the end of the build + + --message-format <FMT> Error format + + -q, --quiet Display one character per test instead of one line + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to run tests for + + --workspace Test all packages in the workspace + + --exclude <SPEC> Exclude packages from the test + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Test only this package's library + + --bins Test all binaries + + --bin [<NAME>] Test only the specified binary + + --examples Test all examples + + --example [<NAME>] Test only the specified example + + --tests Test all test targets + + --test [<NAME>] Test only the specified test target + + --benches Test all bench targets + + --bench [<NAME>] Test only the specified bench target + + --all-targets Test all targets (does not include doctests) + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help test` for more detailed information. + + Run `cargo test -- --help` for test binary options. + + + + + + diff --git a/tests/testsuite/cargo_test/no_keep_going/mod.rs b/tests/testsuite/cargo_test/no_keep_going/mod.rs index c8247863ed1..385a83c726c 100644 --- a/tests/testsuite/cargo_test/no_keep_going/mod.rs +++ b/tests/testsuite/cargo_test/no_keep_going/mod.rs @@ -17,5 +17,5 @@ fn case() { .assert() .code(1) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_test/no_keep_going/stderr.log b/tests/testsuite/cargo_test/no_keep_going/stderr.log deleted file mode 100644 index 22323e651e7..00000000000 --- a/tests/testsuite/cargo_test/no_keep_going/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: unexpected argument '--keep-going' found - - tip: use `--no-fail-fast` to run as many tests as possible regardless of failure - -Usage: cargo[EXE] test [OPTIONS] [TESTNAME] [-- [ARGS]...] - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_test/no_keep_going/stderr.term.svg b/tests/testsuite/cargo_test/no_keep_going/stderr.term.svg new file mode 100644 index 00000000000..b83508dd8a8 --- /dev/null +++ b/tests/testsuite/cargo_test/no_keep_going/stderr.term.svg @@ -0,0 +1,42 @@ + + + + + + + error: unexpected argument '--keep-going' found + + + + tip: use `--no-fail-fast` to run as many tests as possible regardless of failure + + + + Usage: cargo[EXE] test [OPTIONS] [TESTNAME] [-- [ARGS]...] + + + + For more information, try '--help'. + + + + + + diff --git a/tests/testsuite/cargo_tree/help/mod.rs b/tests/testsuite/cargo_tree/help/mod.rs index eed0a122c92..bdeeb4caa58 100644 --- a/tests/testsuite/cargo_tree/help/mod.rs +++ b/tests/testsuite/cargo_tree/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_tree/help/stdout.log b/tests/testsuite/cargo_tree/help/stdout.log deleted file mode 100644 index 9865fd59e28..00000000000 --- a/tests/testsuite/cargo_tree/help/stdout.log +++ /dev/null @@ -1,45 +0,0 @@ -Display a tree visualization of a dependency graph - -Usage: cargo[EXE] tree [OPTIONS] - -Options: - -e, --edges The kinds of dependencies to display (features, normal, build, dev, all, - no-normal, no-build, no-dev, no-proc-macro) - -i, --invert [] Invert the tree direction and focus on the given package - --prune Prune the given package from the display of the dependency tree - --depth Maximum display depth of the dependency tree - --prefix Change the prefix (indentation) of how each entry is displayed [default: - indent] [possible values: depth, indent, none] - --no-dedupe Do not de-duplicate (repeats all shared dependencies) - -d, --duplicates Show only dependencies which come in multiple versions (implies -i) - --charset Character set to use in output [default: utf8] [possible values: utf8, - ascii] - -f, --format Format string used for printing dependencies [default: {p}] - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package to be used as the root of the tree - --workspace Display the tree for all packages in the workspace - --exclude Exclude specific workspace members - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - --target [] Filter dependencies matching the given target-triple (default host - platform). Pass `all` to include all targets. - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help tree` for more detailed information. diff --git a/tests/testsuite/cargo_tree/help/stdout.term.svg b/tests/testsuite/cargo_tree/help/stdout.term.svg new file mode 100644 index 00000000000..c7ab6b80047 --- /dev/null +++ b/tests/testsuite/cargo_tree/help/stdout.term.svg @@ -0,0 +1,116 @@ + + + + + + + Display a tree visualization of a dependency graph + + + + Usage: cargo[EXE] tree [OPTIONS] + + + + Options: + + -e, --edges <KINDS> The kinds of dependencies to display (features, normal, build, dev, all, + + no-normal, no-build, no-dev, no-proc-macro) + + -i, --invert [<SPEC>] Invert the tree direction and focus on the given package + + --prune <SPEC> Prune the given package from the display of the dependency tree + + --depth <DEPTH> Maximum display depth of the dependency tree + + --prefix <PREFIX> Change the prefix (indentation) of how each entry is displayed [default: + + indent] [possible values: depth, indent, none] + + --no-dedupe Do not de-duplicate (repeats all shared dependencies) + + -d, --duplicates Show only dependencies which come in multiple versions (implies -i) + + --charset <CHARSET> Character set to use in output [default: utf8] [possible values: utf8, + + ascii] + + -f, --format <FORMAT> Format string used for printing dependencies [default: {p}] + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to be used as the root of the tree + + --workspace Display the tree for all packages in the workspace + + --exclude <SPEC> Exclude specific workspace members + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + --target [<TRIPLE>] Filter dependencies matching the given target-triple (default host + + platform). Pass `all` to include all targets. + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help tree` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_uninstall/help/mod.rs b/tests/testsuite/cargo_uninstall/help/mod.rs index 0bcf73b78e3..c9cdb66c972 100644 --- a/tests/testsuite/cargo_uninstall/help/mod.rs +++ b/tests/testsuite/cargo_uninstall/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_uninstall/help/stdout.log b/tests/testsuite/cargo_uninstall/help/stdout.log deleted file mode 100644 index 1988e7a0e8e..00000000000 --- a/tests/testsuite/cargo_uninstall/help/stdout.log +++ /dev/null @@ -1,28 +0,0 @@ -Remove a Rust binary - -Usage: cargo[EXE] uninstall [OPTIONS] [SPEC]... - -Arguments: - [SPEC]... - -Options: - --root Directory to uninstall packages from - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package to uninstall - -Target Selection: - --bin Only uninstall the binary NAME - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help uninstall` for more detailed information. diff --git a/tests/testsuite/cargo_uninstall/help/stdout.term.svg b/tests/testsuite/cargo_uninstall/help/stdout.term.svg new file mode 100644 index 00000000000..561ca857633 --- /dev/null +++ b/tests/testsuite/cargo_uninstall/help/stdout.term.svg @@ -0,0 +1,82 @@ + + + + + + + Remove a Rust binary + + + + Usage: cargo[EXE] uninstall [OPTIONS] [SPEC]... + + + + Arguments: + + [SPEC]... + + + + Options: + + --root <DIR> Directory to uninstall packages from + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to uninstall + + + + Target Selection: + + --bin <NAME> Only uninstall the binary NAME + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help uninstall` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_update/help/mod.rs b/tests/testsuite/cargo_update/help/mod.rs index 6b9872b20ea..f7a2fb519aa 100644 --- a/tests/testsuite/cargo_update/help/mod.rs +++ b/tests/testsuite/cargo_update/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_update/help/stdout.log b/tests/testsuite/cargo_update/help/stdout.log deleted file mode 100644 index 8e0bf2ccb2d..00000000000 --- a/tests/testsuite/cargo_update/help/stdout.log +++ /dev/null @@ -1,26 +0,0 @@ -Update dependencies as recorded in the local lock file - -Usage: cargo[EXE] update [OPTIONS] [SPEC]... - -Options: - -n, --dry-run Don't actually write the lockfile - --recursive Force updating all dependencies of [SPEC]... as well - --precise Update [SPEC] to exactly PRECISE - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -w, --workspace Only update the workspace packages - [SPEC]... Package to update - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help update` for more detailed information. diff --git a/tests/testsuite/cargo_update/help/stdout.term.svg b/tests/testsuite/cargo_update/help/stdout.term.svg new file mode 100644 index 00000000000..50fd1cf8ef9 --- /dev/null +++ b/tests/testsuite/cargo_update/help/stdout.term.svg @@ -0,0 +1,78 @@ + + + + + + + Update dependencies as recorded in the local lock file + + + + Usage: cargo[EXE] update [OPTIONS] [SPEC]... + + + + Options: + + -n, --dry-run Don't actually write the lockfile + + --recursive Force updating all dependencies of [SPEC]... as well + + --precise <PRECISE> Update [SPEC] to exactly PRECISE + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -w, --workspace Only update the workspace packages + + [SPEC]... Package to update + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help update` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs index 23ad8fbb028..ccc373210c3 100644 --- a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs +++ b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs @@ -17,5 +17,5 @@ fn case() { .assert() .code(101) .stdout_matches(str![""]) - .stderr_matches(file!["stderr.log"]); + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/stderr.log b/tests/testsuite/cargo_update/toolchain_pkgname/stderr.log deleted file mode 100644 index 7e5870c540a..00000000000 --- a/tests/testsuite/cargo_update/toolchain_pkgname/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ -error: invalid character `+` in package name: `+stable` - Use `cargo +stable update` if you meant to use the `stable` toolchain. diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/stderr.term.svg b/tests/testsuite/cargo_update/toolchain_pkgname/stderr.term.svg new file mode 100644 index 00000000000..f765e053a07 --- /dev/null +++ b/tests/testsuite/cargo_update/toolchain_pkgname/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + error: invalid character `+` in package name: `+stable` + + Use `cargo +stable update` if you meant to use the `stable` toolchain. + + + + + + diff --git a/tests/testsuite/cargo_vendor/help/mod.rs b/tests/testsuite/cargo_vendor/help/mod.rs index b31d9006288..d2669ca2f53 100644 --- a/tests/testsuite/cargo_vendor/help/mod.rs +++ b/tests/testsuite/cargo_vendor/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_vendor/help/stdout.log b/tests/testsuite/cargo_vendor/help/stdout.log deleted file mode 100644 index 4e05e75c8fa..00000000000 --- a/tests/testsuite/cargo_vendor/help/stdout.log +++ /dev/null @@ -1,27 +0,0 @@ -Vendor all dependencies for a project locally - -Usage: cargo[EXE] vendor [OPTIONS] [path] - -Arguments: - [path] Where to vendor crates (`vendor` by default) - -Options: - --no-delete Don't delete older crates in the vendor directory - -s, --sync Additional `Cargo.toml` to sync and vendor - --respect-source-config Respect `[source]` config in `.cargo/config` - --versioned-dirs Always include version in subdir name - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help vendor` for more detailed information. diff --git a/tests/testsuite/cargo_vendor/help/stdout.term.svg b/tests/testsuite/cargo_vendor/help/stdout.term.svg new file mode 100644 index 00000000000..71c13b4d3fa --- /dev/null +++ b/tests/testsuite/cargo_vendor/help/stdout.term.svg @@ -0,0 +1,80 @@ + + + + + + + Vendor all dependencies for a project locally + + + + Usage: cargo[EXE] vendor [OPTIONS] [path] + + + + Arguments: + + [path] Where to vendor crates (`vendor` by default) + + + + Options: + + --no-delete Don't delete older crates in the vendor directory + + -s, --sync <TOML> Additional `Cargo.toml` to sync and vendor + + --respect-source-config Respect `[source]` config in `.cargo/config` + + --versioned-dirs Always include version in subdir name + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help vendor` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_verify_project/help/mod.rs b/tests/testsuite/cargo_verify_project/help/mod.rs index 0ba01a1a982..882abde1a77 100644 --- a/tests/testsuite/cargo_verify_project/help/mod.rs +++ b/tests/testsuite/cargo_verify_project/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_verify_project/help/stdout.log b/tests/testsuite/cargo_verify_project/help/stdout.log deleted file mode 100644 index 7adc34e6c75..00000000000 --- a/tests/testsuite/cargo_verify_project/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Check correctness of crate manifest - -Usage: cargo[EXE] verify-project [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help verify-project` for more detailed information. diff --git a/tests/testsuite/cargo_verify_project/help/stdout.term.svg b/tests/testsuite/cargo_verify_project/help/stdout.term.svg new file mode 100644 index 00000000000..0f75f82f765 --- /dev/null +++ b/tests/testsuite/cargo_verify_project/help/stdout.term.svg @@ -0,0 +1,64 @@ + + + + + + + Check correctness of crate manifest + + + + Usage: cargo[EXE] verify-project [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help verify-project` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_version/help/mod.rs b/tests/testsuite/cargo_version/help/mod.rs index e1741364f67..dc303db184d 100644 --- a/tests/testsuite/cargo_version/help/mod.rs +++ b/tests/testsuite/cargo_version/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_version/help/stdout.log b/tests/testsuite/cargo_version/help/stdout.log deleted file mode 100644 index 2ad1c551c8c..00000000000 --- a/tests/testsuite/cargo_version/help/stdout.log +++ /dev/null @@ -1,18 +0,0 @@ -Show version information - -Usage: cargo[EXE] version [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help version` for more detailed information. diff --git a/tests/testsuite/cargo_version/help/stdout.term.svg b/tests/testsuite/cargo_version/help/stdout.term.svg new file mode 100644 index 00000000000..0986ae6e89a --- /dev/null +++ b/tests/testsuite/cargo_version/help/stdout.term.svg @@ -0,0 +1,62 @@ + + + + + + + Show version information + + + + Usage: cargo[EXE] version [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help version` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_yank/help/mod.rs b/tests/testsuite/cargo_yank/help/mod.rs index c64e9773173..8d0473cafb8 100644 --- a/tests/testsuite/cargo_yank/help/mod.rs +++ b/tests/testsuite/cargo_yank/help/mod.rs @@ -9,6 +9,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(file!["stdout.term.svg"]) .stderr_matches(str![""]); } diff --git a/tests/testsuite/cargo_yank/help/stdout.log b/tests/testsuite/cargo_yank/help/stdout.log deleted file mode 100644 index 072ceaac7de..00000000000 --- a/tests/testsuite/cargo_yank/help/stdout.log +++ /dev/null @@ -1,26 +0,0 @@ -Remove a pushed crate from the index - -Usage: cargo[EXE] yank [OPTIONS] [CRATE] - -Arguments: - [CRATE] - -Options: - --version The version to yank or un-yank - --undo Undo a yank, putting a version back into the index - --index Registry index URL to yank from - --registry Registry to yank from - --token API token to use when authenticating - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help yank` for more detailed information. diff --git a/tests/testsuite/cargo_yank/help/stdout.term.svg b/tests/testsuite/cargo_yank/help/stdout.term.svg new file mode 100644 index 00000000000..7ede65a0349 --- /dev/null +++ b/tests/testsuite/cargo_yank/help/stdout.term.svg @@ -0,0 +1,78 @@ + + + + + + + Remove a pushed crate from the index + + + + Usage: cargo[EXE] yank [OPTIONS] [CRATE] + + + + Arguments: + + [CRATE] + + + + Options: + + --version <VERSION> The version to yank or un-yank + + --undo Undo a yank, putting a version back into the index + + --index <INDEX> Registry index URL to yank from + + --registry <REGISTRY> Registry to yank from + + --token <TOKEN> API token to use when authenticating + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help yank` for more detailed information. + + + + + +