diff --git a/src/cargo/core/compiler/job_queue/mod.rs b/src/cargo/core/compiler/job_queue/mod.rs index e36faa12fff3..0ce87bf00866 100644 --- a/src/cargo/core/compiler/job_queue/mod.rs +++ b/src/cargo/core/compiler/job_queue/mod.rs @@ -826,6 +826,9 @@ impl<'gctx> DrainState<'gctx> { // `display_error` inside `handle_error`. Some(anyhow::Error::new(AlreadyPrintedError::new(error))) } else if self.queue.is_empty() && self.pending_queue.is_empty() { +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD let profile_link = build_runner.bcx.gctx.shell().err_hyperlink( "https://doc.rust-lang.org/cargo/reference/profiles.html#default-profiles", ); @@ -833,6 +836,20 @@ impl<'gctx> DrainState<'gctx> { "{profile_link}`{profile_name}` profile [{opt_type}]{profile_link:#} target(s) in {time_elapsed}", ); if !build_runner.bcx.build_config.build_plan { +======= + let message = + format!("`{profile_name}` profile [{opt_type}] target(s) in {time_elapsed}",); +======= + let message = format!("{profile_name} [{opt_type}] target(s) in {time_elapsed}",); +>>>>>>> parent of e7e8d8748 (fix(compiler): Clarify we're showing a profile name) +======= + let message = format!( + "{} [{}] target(s) in {}", + profile_name, opt_type, time_elapsed + ); +>>>>>>> parent of 1906d27cf (refactor(compiler): Use inline string interpolation) + if !cx.bcx.build_config.build_plan { +>>>>>>> parent of 69f38a08d (fix(compiler): Link people to more info about profiles) // It doesn't really matter if this fails. let _ = build_runner.bcx.gctx.shell().status("Finished", message); future_incompat::save_and_display_report( diff --git a/tests/build-std/main.rs b/tests/build-std/main.rs index 849157908511..b32231d6bef5 100644 --- a/tests/build-std/main.rs +++ b/tests/build-std/main.rs @@ -114,7 +114,7 @@ fn basic() { // There have been multiple bugs where every build triggers and update. .with_stderr( "[COMPILING] foo v0.0.1 [..]\n\ - [FINISHED] `dev` profile [..]", + [FINISHED] dev [..]", ) .run(); p.cargo("run").build_std().target_host().run(); @@ -262,7 +262,7 @@ fn remap_path_scope() { .with_status(101) .with_stderr_contains( "\ -[FINISHED] `release` profile [optimized + debuginfo] [..] +[FINISHED] release [optimized + debuginfo] [..] [RUNNING] [..] [..]thread '[..]' panicked at [..]src/main.rs:3:[..]", ) diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs index 1fef04e3ae42..019813425ef1 100644 --- a/tests/testsuite/alt_registry.rs +++ b/tests/testsuite/alt_registry.rs @@ -38,7 +38,7 @@ fn depend_on_alt_registry() { [DOWNLOADED] bar v0.0.1 (registry `alternative`) [CHECKING] bar v0.0.1 (registry `alternative`) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -51,7 +51,7 @@ fn depend_on_alt_registry() { "\ [CHECKING] bar v0.0.1 (registry `alternative`) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -95,7 +95,7 @@ fn depend_on_alt_registry_depends_on_same_registry_no_index() { [CHECKING] baz v0.0.1 (registry `alternative`) [CHECKING] bar v0.0.1 (registry `alternative`) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -139,7 +139,7 @@ fn depend_on_alt_registry_depends_on_same_registry() { [CHECKING] baz v0.0.1 (registry `alternative`) [CHECKING] bar v0.0.1 (registry `alternative`) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -184,7 +184,7 @@ fn depend_on_alt_registry_depends_on_crates_io() { [CHECKING] baz v0.0.1 [CHECKING] bar v0.0.1 (registry `alternative`) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -220,7 +220,7 @@ fn registry_and_path_dep_works() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.0.1 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -428,7 +428,7 @@ fn alt_registry_and_crates_io_deps() { [CHECKING] alt_reg_dep v0.1.0 (registry `alternative`) [CHECKING] crates_io_dep v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -701,7 +701,7 @@ fn patch_alt_reg() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.0 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -796,7 +796,7 @@ fn no_api() { [DOWNLOADED] bar v0.0.1 (registry `alternative`) [CHECKING] bar v0.0.1 (registry `alternative`) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1359,7 +1359,7 @@ fn registries_index_relative_url() { [DOWNLOADED] bar v0.0.1 (registry `relative`) [CHECKING] bar v0.0.1 (registry `relative`) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs index 3ed3cce127ec..aca7a795b822 100644 --- a/tests/testsuite/bad_config.rs +++ b/tests/testsuite/bad_config.rs @@ -686,7 +686,7 @@ fn unused_keys() { "\ warning: unused manifest key: target.foo.bar [CHECKING] foo v0.1.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -711,7 +711,7 @@ warning: unused manifest key: target.foo.bar "\ warning: unused manifest key: package.bulid [CHECKING] foo [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -739,7 +739,7 @@ warning: unused manifest key: package.bulid "\ warning: unused manifest key: lib.build [CHECKING] foo [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -764,7 +764,7 @@ fn unused_keys_in_virtual_manifest() { "\ [WARNING] [..]/foo/Cargo.toml: unused manifest key: workspace.bulid [CHECKING] bar [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/bench.rs b/tests/testsuite/bench.rs index eb9c92c1eddf..cd1c05a56842 100644 --- a/tests/testsuite/bench.rs +++ b/tests/testsuite/bench.rs @@ -39,7 +39,7 @@ fn cargo_bench_simple() { .with_stderr( "\ [COMPILING] foo v0.5.0 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE])", ) .with_stdout_contains("test bench_hello ... bench: [..]") @@ -81,7 +81,7 @@ fn bench_bench_implicit() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE]) [RUNNING] [..] (target/release/deps/mybench-[..][EXE]) ", @@ -125,7 +125,7 @@ fn bench_bin_implicit() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE]) ", ) @@ -158,7 +158,7 @@ fn bench_tarname() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/bin2-[..][EXE]) ", ) @@ -223,7 +223,7 @@ fn cargo_bench_verbose() { "\ [COMPILING] foo v0.5.0 ([CWD]) [RUNNING] `rustc [..] src/main.rs [..]` -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] `[..]target/release/deps/foo-[..][EXE] hello --bench`", ) .with_stdout_contains("test bench_hello ... bench: [..]") @@ -310,7 +310,7 @@ fn cargo_bench_failing_test() { .with_stderr_contains( "\ [COMPILING] foo v0.5.0 ([CWD])[..] -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE])", ) .with_stdout_contains("[..]thread '[..]' panicked at[..]") @@ -378,7 +378,7 @@ fn bench_with_lib_dep() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE]) [RUNNING] [..] (target/release/deps/baz-[..][EXE])", ) @@ -441,7 +441,7 @@ fn bench_with_deep_lib_dep() { [LOCKING] 2 packages to latest compatible versions [COMPILING] foo v0.0.1 ([..]) [COMPILING] bar v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/bar-[..][EXE])", ) .with_stdout_contains("test bar_bench ... bench: [..]") @@ -495,7 +495,7 @@ fn external_bench_explicit() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE]) [RUNNING] [..] (target/release/deps/bench-[..][EXE])", ) @@ -538,7 +538,7 @@ fn external_bench_implicit() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE]) [RUNNING] [..] (target/release/deps/external-[..][EXE])", ) @@ -613,7 +613,7 @@ automatically infer them to be a target, such as in subfolders. For more information on this warning you can consult https://github.com/rust-lang/cargo/issues/5330 [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE]) ", ) @@ -652,7 +652,7 @@ fn pass_through_command_line() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE])", ) .with_stdout_contains("test bar ... bench: [..]") @@ -660,7 +660,7 @@ fn pass_through_command_line() { p.cargo("bench foo") .with_stderr( - "[FINISHED] `bench` profile [optimized] target(s) in [..] + "[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE])", ) .with_stdout_contains("test foo ... bench: [..]") @@ -738,7 +738,7 @@ fn lib_bin_same_name() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE]) [RUNNING] [..] (target/release/deps/foo-[..][EXE])", ) @@ -783,7 +783,7 @@ fn lib_with_standard_name() { .with_stderr( "\ [COMPILING] syntax v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/syntax-[..][EXE]) [RUNNING] [..] (target/release/deps/bench-[..][EXE])", ) @@ -832,7 +832,7 @@ fn lib_with_standard_name2() { .with_stderr( "\ [COMPILING] syntax v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/syntax-[..][EXE])", ) .with_stdout_contains("test bench ... bench: [..]") @@ -911,7 +911,7 @@ fn bench_dylib() { [RUNNING] [..] -C opt-level=3 [..] [RUNNING] [..] -C opt-level=3 [..] [RUNNING] [..] -C opt-level=3 [..] -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench` [RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`", ) @@ -924,7 +924,7 @@ fn bench_dylib() { "\ [FRESH] bar v0.0.1 ([CWD]/bar) [FRESH] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench` [RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`", ) @@ -963,7 +963,7 @@ fn bench_twice_with_build_cmd() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE])", ) .with_stdout_contains("test foo ... bench: [..]") @@ -971,7 +971,7 @@ fn bench_twice_with_build_cmd() { p.cargo("bench") .with_stderr( - "[FINISHED] `bench` profile [optimized] target(s) in [..] + "[FINISHED] bench [optimized] target(s) in [..] [RUNNING] [..] (target/release/deps/foo-[..][EXE])", ) .with_stdout_contains("test foo ... bench: [..]") @@ -1053,7 +1053,7 @@ fn bench_with_examples() { [RUNNING] `rustc [..]` [RUNNING] `rustc [..]` [RUNNING] `rustc [..]` -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] `[CWD]/target/release/deps/foo-[..][EXE] --bench` [RUNNING] `[CWD]/target/release/deps/testb1-[..][EXE] --bench`", ) @@ -1092,7 +1092,7 @@ fn test_a_bench() { .with_stderr( "\ [COMPILING] foo v0.1.0 ([..]) -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] [..] (target/debug/deps/b-[..][EXE])", ) .with_stdout_contains("test foo ... ok") @@ -1122,7 +1122,7 @@ fn test_bench_no_run() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([..]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [EXECUTABLE] benches src/lib.rs (target/release/deps/foo-[..][EXE]) [EXECUTABLE] benches/bbaz.rs (target/release/deps/bbaz-[..][EXE]) ", @@ -1153,7 +1153,7 @@ fn test_bench_no_run_emit_json() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([..]) -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] ", ) .run(); @@ -1204,7 +1204,7 @@ fn test_bench_no_fail_fast() { .with_stderr( "\ [COMPILING] foo v0.5.0 [..] -[FINISHED] `bench` profile [..] +[FINISHED] bench [..] [RUNNING] unittests src/main.rs (target/release/deps/foo[..]) [ERROR] bench failed, to rerun pass `--bin foo` [RUNNING] benches/b1.rs (target/release/deps/b1[..]) @@ -1721,7 +1721,7 @@ fn cargo_bench_print_env_verbose() { "\ [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `[..]CARGO_MANIFEST_DIR=[CWD][..] rustc[..]` -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] `[..]CARGO_MANIFEST_DIR=[CWD][..] [CWD]/target/release/deps/foo-[..][EXE] --bench`", ) .run(); diff --git a/tests/testsuite/binary_name.rs b/tests/testsuite/binary_name.rs index 7ef877c139c9..2f858e187ec6 100644 --- a/tests/testsuite/binary_name.rs +++ b/tests/testsuite/binary_name.rs @@ -181,7 +181,7 @@ fn binary_name2() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] [..] (target/debug/deps/foo-[..][EXE])", ) .with_stdout_contains("test tests::check_crabs ... ok") diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 7da48de80cf9..46db5a61b889 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -1522,7 +1522,7 @@ fn cargo_default_env_metadata_env_var() { --out-dir [..] \ -L dependency=[CWD]/target/debug/deps \ --extern bar=[CWD]/target/debug/deps/{prefix}bar{suffix}` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]", +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]", prefix = env::consts::DLL_PREFIX, suffix = env::consts::DLL_SUFFIX, )) @@ -1550,7 +1550,7 @@ fn cargo_default_env_metadata_env_var() { --out-dir [..] \ -L dependency=[CWD]/target/debug/deps \ --extern bar=[CWD]/target/debug/deps/{prefix}bar-[..]{suffix}` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", prefix = env::consts::DLL_PREFIX, suffix = env::consts::DLL_SUFFIX, @@ -2278,7 +2278,7 @@ fn lto_build() { -C opt-level=3 \ -C lto \ [..] -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", ) .run(); @@ -2296,7 +2296,7 @@ fn verbose_build() { -C metadata=[..] \ --out-dir [..] \ -L dependency=[CWD]/target/debug/deps` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -2315,7 +2315,7 @@ fn verbose_release_build() { -C metadata=[..] \ --out-dir [..] \ -L dependency=[CWD]/target/release/deps` -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", ) .run(); @@ -2334,7 +2334,7 @@ fn verbose_release_build_short() { -C metadata=[..] \ --out-dir [..] \ -L dependency=[CWD]/target/release/deps` -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", ) .run(); @@ -2397,7 +2397,7 @@ fn verbose_release_build_deps() { -L dependency=[CWD]/target/release/deps \ --extern foo=[CWD]/target/release/deps/{prefix}foo{suffix} \ --extern foo=[CWD]/target/release/deps/libfoo.rlib` -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", prefix = env::consts::DLL_PREFIX, suffix = env::consts::DLL_SUFFIX @@ -2995,7 +2995,7 @@ fn lib_with_standard_name() { .with_stderr( "\ [COMPILING] syntax v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3116,7 +3116,7 @@ fn freshness_ignores_excluded() { .with_stderr( "\ [COMPILING] foo v0.0.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3171,7 +3171,7 @@ fn rebuild_preserves_out_dir() { .with_stderr( "\ [COMPILING] foo v0.0.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3181,7 +3181,7 @@ fn rebuild_preserves_out_dir() { .with_stderr( "\ [COMPILING] foo v0.0.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4316,7 +4316,7 @@ fn no_warn_about_package_metadata() { p.cargo("build") .with_stderr( "[..] foo v0.0.1 ([..])\n\ - [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]\n", + [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n", ) .run(); } @@ -4354,7 +4354,7 @@ fn no_warn_about_workspace_metadata() { p.cargo("build") .with_stderr( "[..] foo v0.0.1 ([..])\n\ - [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]\n", + [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n", ) .run(); } @@ -4425,7 +4425,7 @@ fn build_all_workspace() { [LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([..]) [COMPILING] foo v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4460,7 +4460,7 @@ fn build_all_exclude() { [LOCKING] 3 packages to latest compatible versions [COMPILING] foo v0.1.0 ([..]) [COMPILING] bar v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4532,7 +4532,7 @@ fn build_all_exclude_not_found() { [WARNING] excluded package(s) `baz` not found in workspace [..] [COMPILING] foo v0.1.0 ([..]) [COMPILING] bar v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4567,7 +4567,7 @@ fn build_all_exclude_glob() { [LOCKING] 3 packages to latest compatible versions [COMPILING] foo v0.1.0 ([..]) [COMPILING] bar v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4601,7 +4601,7 @@ fn build_all_exclude_glob_not_found() { [LOCKING] 2 packages to latest compatible versions [COMPILING] [..] v0.1.0 ([..]) [COMPILING] [..] v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4652,7 +4652,7 @@ fn build_all_workspace_implicit_examples() { "[LOCKING] 2 packages to latest compatible versions\n\ [..] Compiling bar v0.1.0 ([..])\n\ [..] Compiling foo v0.1.0 ([..])\n\ - [..] Finished `dev` profile [unoptimized + debuginfo] target(s) in [..]\n", + [..] Finished dev [unoptimized + debuginfo] target(s) in [..]\n", ) .run(); assert!(!p.bin("a").is_file()); @@ -4688,7 +4688,7 @@ fn build_all_virtual_manifest() { [LOCKING] 2 packages to latest compatible versions [COMPILING] baz v0.1.0 ([..]) [COMPILING] bar v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4717,7 +4717,7 @@ fn build_virtual_manifest_all_implied() { [LOCKING] 2 packages to latest compatible versions [COMPILING] baz v0.1.0 ([..]) [COMPILING] bar v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4745,7 +4745,7 @@ fn build_virtual_manifest_one_project() { "\ [LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4773,7 +4773,7 @@ fn build_virtual_manifest_glob() { "\ [LOCKING] 2 packages to latest compatible versions [COMPILING] baz v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4850,7 +4850,7 @@ fn build_all_virtual_manifest_implicit_examples() { [LOCKING] 2 packages to latest compatible versions [COMPILING] baz v0.1.0 ([..]) [COMPILING] bar v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4899,7 +4899,7 @@ fn build_all_member_dependency_same_name() { [DOWNLOADED] a v0.1.0 ([..])\n\ [COMPILING] a v0.1.0\n\ [COMPILING] a v0.1.0 ([..])\n\ - [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]\n", + [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n", ) .run(); } @@ -5308,7 +5308,7 @@ fn deterministic_cfg_flags() { --cfg[..]default[..]--cfg[..]f_a[..]--cfg[..]f_b[..]\ --cfg[..]f_c[..]--cfg[..]f_d[..] \ --cfg cfg_a --cfg cfg_b --cfg cfg_c --cfg cfg_d --cfg cfg_e` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]", +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]", ) .run(); } @@ -6284,7 +6284,7 @@ fn build_lib_only() { -C metadata=[..] \ --out-dir [..] \ -L dependency=[CWD]/target/debug/deps` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]", +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]", ) .run(); } diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index 18ba76c44ddb..9f5e828ef6bd 100644 --- a/tests/testsuite/build_script.rs +++ b/tests/testsuite/build_script.rs @@ -901,7 +901,7 @@ fn custom_build_script_rustc_flags() { -L dependency=[CWD]/target/debug/deps \ --extern foo=[..]libfoo-[..] \ -L /dummy/path1 -L /dummy/path2` -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -963,7 +963,7 @@ fn custom_build_script_rustc_flags_no_space() { -L dependency=[CWD]/target/debug/deps \ --extern foo=[..]libfoo-[..] \ -L /dummy/path1 -L /dummy/path2` -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -1246,7 +1246,7 @@ fn overrides_and_links() { [..] [..] [RUNNING] `rustc --crate-name foo [..] -L foo -L bar` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1377,7 +1377,7 @@ fn only_rerun_build_script() { [COMPILING] foo v0.5.0 ([CWD]) [RUNNING] `[..]/build-script-build` [RUNNING] `rustc --crate-name foo [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1488,7 +1488,7 @@ fn testing_and_such() { [RUNNING] `[..]/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [RUNNING] `rustc --crate-name foo [..]` -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]/foo-[..][EXE]` [DOCTEST] foo [RUNNING] `rustdoc [..]--test [..]`", @@ -1502,7 +1502,7 @@ fn testing_and_such() { "\ [DOCUMENTING] foo v0.5.0 ([CWD]) [RUNNING] `rustdoc [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -1514,7 +1514,7 @@ fn testing_and_such() { .with_stderr( "\ [COMPILING] foo v0.5.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo[EXE]` ", ) @@ -1712,7 +1712,7 @@ fn build_deps_simple() { [RUNNING] `rustc [..] build.rs [..] --extern a=[..]` [RUNNING] `[..]/foo-[..]/build-script-build` [RUNNING] `rustc --crate-name foo [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1841,7 +1841,7 @@ fn build_cmd_with_a_build_cmd() { -C metadata=[..] \ --out-dir [..] \ -L [..]target/debug/deps` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -2060,7 +2060,7 @@ fn code_generation() { .with_stderr( "\ [COMPILING] foo v0.5.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo[EXE]`", ) .with_stdout("Hello, World!") @@ -2647,7 +2647,7 @@ fn cfg_test() { [RUNNING] [..] --cfg foo[..] [RUNNING] [..] --cfg foo[..] [RUNNING] [..] --cfg foo[..] -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]/foo-[..][EXE]` [RUNNING] `[..]/test-[..][EXE]` [DOCTEST] foo @@ -2764,7 +2764,7 @@ fn cfg_override_test() { [RUNNING] `[..]` [RUNNING] `[..]` [RUNNING] `[..]` -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]/foo-[..][EXE]` [RUNNING] `[..]/test-[..][EXE]` [DOCTEST] foo @@ -2904,7 +2904,7 @@ fn env_test() { [RUNNING] [..] --crate-name foo[..] [RUNNING] [..] --crate-name foo[..] [RUNNING] [..] --crate-name test[..] -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]/foo-[..][EXE]` [RUNNING] `[..]/test-[..][EXE]` [DOCTEST] foo @@ -3010,7 +3010,7 @@ fn flags_go_into_tests() { [COMPILING] foo v0.5.0 ([..] [RUNNING] `rustc [..] src/lib.rs [..] -L test[..]` [RUNNING] `rustc [..] tests/foo.rs [..] -L test[..]` -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]/foo-[..][EXE]`", ) .with_stdout_contains("running 0 tests") @@ -3022,7 +3022,7 @@ fn flags_go_into_tests() { [FRESH] a v0.5.0 ([..] [COMPILING] b v0.5.0 ([..] [RUNNING] `rustc [..] b/src/lib.rs [..] -L test[..]` -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]/b-[..][EXE]`", ) .with_stdout_contains("running 0 tests") @@ -3111,7 +3111,7 @@ fn diamond_passes_args_only_once() { [RUNNING] `rustc [..]` [COMPILING] foo v0.5.0 ([..] [RUNNING] `[..]rmeta -L native=test` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3152,7 +3152,7 @@ fn adding_an_override_invalidates() { [RUNNING] `rustc [..]` [RUNNING] `[..]` [RUNNING] `rustc [..] -L native=foo` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3173,7 +3173,7 @@ fn adding_an_override_invalidates() { "\ [COMPILING] foo v0.5.0 ([..] [RUNNING] `rustc [..] -L native=bar` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3214,7 +3214,7 @@ fn changing_an_override_invalidates() { "\ [COMPILING] foo v0.5.0 ([..] [RUNNING] `rustc [..] -L native=foo` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3236,7 +3236,7 @@ fn changing_an_override_invalidates() { [DIRTY] foo v0.5.0 ([..]): the precalculated components changed [COMPILING] foo v0.5.0 ([..] [RUNNING] `rustc [..] -L native=bar` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3280,7 +3280,7 @@ fn fresh_builds_possible_with_link_libs() { "\ [COMPILING] foo v0.5.0 ([..] [RUNNING] `rustc [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3289,7 +3289,7 @@ fn fresh_builds_possible_with_link_libs() { .with_stderr( "\ [FRESH] foo v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3335,7 +3335,7 @@ fn fresh_builds_possible_with_multiple_metadata_overrides() { "\ [COMPILING] foo v0.5.0 ([..] [RUNNING] `rustc [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3344,7 +3344,7 @@ fn fresh_builds_possible_with_multiple_metadata_overrides() { .with_stderr( "\ [FRESH] foo v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3534,7 +3534,7 @@ fn rebuild_only_on_explicit_paths() { [COMPILING] foo v0.5.0 ([..]) [RUNNING] `[..]/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3553,7 +3553,7 @@ fn rebuild_only_on_explicit_paths() { [COMPILING] foo v0.5.0 ([..]) [RUNNING] `[..]/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3563,7 +3563,7 @@ fn rebuild_only_on_explicit_paths() { .with_stderr( "\ [FRESH] foo v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3577,7 +3577,7 @@ fn rebuild_only_on_explicit_paths() { .with_stderr( "\ [FRESH] foo v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3592,7 +3592,7 @@ fn rebuild_only_on_explicit_paths() { [COMPILING] foo v0.5.0 ([..]) [RUNNING] `[..]/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3607,7 +3607,7 @@ fn rebuild_only_on_explicit_paths() { [COMPILING] foo v0.5.0 ([..]) [RUNNING] `[..]/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3893,7 +3893,7 @@ fn warnings_emitted() { warning: foo@0.5.0: foo warning: foo@0.5.0: bar [RUNNING] `rustc [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -3989,7 +3989,7 @@ fn warnings_hidden_for_upstream() { [RUNNING] `rustc [..]` [COMPILING] foo v0.5.0 ([..]) [RUNNING] `rustc [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4053,7 +4053,7 @@ warning: bar@0.1.0: bar [RUNNING] `[..] rustc [..]` [COMPILING] foo v0.5.0 ([..]) [RUNNING] `[..] rustc [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4096,7 +4096,7 @@ fn output_shows_on_vv() { [RUNNING] `[..]` [foo 0.5.0] stderr [RUNNING] `[..] rustc [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -4784,7 +4784,7 @@ fn optional_build_dep_and_required_normal_dep() { [LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.5.0 ([..]) [COMPILING] foo v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]foo[EXE]`", ) .run(); @@ -4795,7 +4795,7 @@ fn optional_build_dep_and_required_normal_dep() { "\ [COMPILING] bar v0.5.0 ([..]) [COMPILING] foo v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]foo[EXE]`", ) .run(); @@ -5118,7 +5118,7 @@ fn rerun_if_published_directory() { "\ [FRESH] mylib-sys v1.0.0 [FRESH] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/cache_messages.rs b/tests/testsuite/cache_messages.rs index 81933f93f729..5e29fadfa85d 100644 --- a/tests/testsuite/cache_messages.rs +++ b/tests/testsuite/cache_messages.rs @@ -349,7 +349,7 @@ fn replay_non_json() { [CHECKING] foo [..] line 1 line 2 -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -360,7 +360,7 @@ line 2 "\ line 1 line 2 -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -409,7 +409,7 @@ fn caching_large_output() { "\ [CHECKING] foo [..] {}warning: `foo` (lib) generated 250 warnings -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", expected )) @@ -420,7 +420,7 @@ fn caching_large_output() { .with_stderr(&format!( "\ {}warning: `foo` (lib) generated 250 warnings -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", expected )) diff --git a/tests/testsuite/cargo_alias_config.rs b/tests/testsuite/cargo_alias_config.rs index 4ea188a88107..8de162efcf14 100644 --- a/tests/testsuite/cargo_alias_config.rs +++ b/tests/testsuite/cargo_alias_config.rs @@ -164,7 +164,7 @@ fn builtin_alias_shadowing_external_subcommand() { .with_stderr( "\ [COMPILING] foo v0.5.0 [..] -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] unittests src/main.rs [..] ", ) @@ -197,7 +197,7 @@ fn alias_shadowing_external_subcommand() { This was previously accepted but is being phased out; it will become a hard error in a future release. For more information, see issue #10049 . [COMPILING] foo v0.5.0 [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -254,7 +254,7 @@ error: alias test-1 has unresolvable recursive definition: test-1 -> echo -> ech "\ [WARNING] user-defined alias `build` is ignored, because it is shadowed by a built-in command [COMPILING] foo v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -350,7 +350,7 @@ fn alias_cannot_shadow_builtin_command() { "\ [WARNING] user-defined alias `build` is ignored, because it is shadowed by a built-in command [COMPILING] foo v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -374,7 +374,7 @@ fn alias_override_builtin_alias() { .with_stderr( "\ [COMPILING] foo v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo[EXE]` ", ) @@ -405,7 +405,7 @@ fn global_options_with_alias() { "\ [CHECKING] foo [..] [RUNNING] `rustc [..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); diff --git a/tests/testsuite/cfg.rs b/tests/testsuite/cfg.rs index 069dd64088ee..dd83d6b91776 100644 --- a/tests/testsuite/cfg.rs +++ b/tests/testsuite/cfg.rs @@ -58,7 +58,7 @@ fn dont_include() { "\ [LOCKING] 2 packages to latest compatible versions [CHECKING] a v0.0.1 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -103,7 +103,7 @@ fn works_through_the_registry() { [CHECKING] baz v0.1.0 [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -152,7 +152,7 @@ fn ignore_version_from_other_platform() { [DOWNLOADED] [..] [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/check_cfg.rs b/tests/testsuite/check_cfg.rs index dff0d538a519..d4dda98f0d7c 100644 --- a/tests/testsuite/check_cfg.rs +++ b/tests/testsuite/check_cfg.rs @@ -397,7 +397,7 @@ fn build_script_doc() { [RUNNING] `[..]/build-script-build` [DOCUMENTING] foo [..] [RUNNING] `rustdoc [..] src/main.rs [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) diff --git a/tests/testsuite/clean.rs b/tests/testsuite/clean.rs index aae84c0c9597..207938d369bc 100644 --- a/tests/testsuite/clean.rs +++ b/tests/testsuite/clean.rs @@ -241,7 +241,7 @@ fn clean_release() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([..]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", ) .run(); @@ -330,7 +330,7 @@ fn build_script() { [RUNNING] `rustc [..] build.rs [..]` [RUNNING] `[..]build-script-build` [RUNNING] `rustc [..] src/main.rs [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/concurrent.rs b/tests/testsuite/concurrent.rs index 1a1ae38fae71..fe4ecfc42296 100644 --- a/tests/testsuite/concurrent.rs +++ b/tests/testsuite/concurrent.rs @@ -434,7 +434,7 @@ fn debug_release_ok() { .with_stderr_contains( "\ [COMPILING] foo v0.0.1 [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run_output(&a); @@ -442,7 +442,7 @@ fn debug_release_ok() { .with_stderr_contains( "\ [COMPILING] foo v0.0.1 [..] -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", ) .run_output(&b); diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs index bcb0a4190179..041fffa478a4 100644 --- a/tests/testsuite/cross_compile.rs +++ b/tests/testsuite/cross_compile.rs @@ -471,7 +471,7 @@ fn cross_tests() { .with_stderr(&format!( "\ [COMPILING] foo v0.0.0 ([CWD]) -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] [..] (target/{triple}/debug/deps/foo-[..][EXE]) [RUNNING] [..] (target/{triple}/debug/deps/bar-[..][EXE])", triple = target @@ -501,7 +501,7 @@ fn no_cross_doctests() { let host_output = "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] [..] (target/debug/deps/foo-[..][EXE]) [DOCTEST] foo "; @@ -519,7 +519,7 @@ fn no_cross_doctests() { [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc --crate-name foo [..]--crate-type lib[..] [RUNNING] `rustc --crate-name foo [..]--test[..] -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[CWD]/target/{target}/debug/deps/foo-[..][EXE]` [DOCTEST] foo [RUNNING] `rustdoc [..]--target {target}[..]` @@ -552,7 +552,7 @@ test result: ok. 1 passed[..] "\ [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc --crate-name foo [..] -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [NOTE] skipping doctests for foo v0.0.1 ([ROOT]/foo) (lib), \ cross-compilation doctests are not yet supported See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#doctest-xcompile \ @@ -572,7 +572,7 @@ for more information. "\ [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc --crate-name foo [..]--test[..] -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[CWD]/target/{triple}/debug/deps/foo-[..][EXE]` [NOTE] skipping doctests for foo v0.0.1 ([ROOT]/foo) (lib), \ cross-compilation doctests are not yet supported @@ -665,7 +665,7 @@ fn cross_with_a_build_script() { [RUNNING] `rustc [..] build.rs [..] --out-dir [CWD]/target/debug/build/foo-[..]` [RUNNING] `[CWD]/target/debug/build/foo-[..]/build-script-build` [RUNNING] `rustc [..] src/main.rs [..] --target {target} [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", target = target, )) @@ -918,7 +918,7 @@ fn plugin_build_script_right_arch() { [RUNNING] `rustc [..] build.rs [..]` [RUNNING] `[..]/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -993,7 +993,7 @@ fn build_script_with_platform_specific_dependencies() { [RUNNING] `rustc [..] build.rs [..]` [RUNNING] `[CWD]/target/debug/build/foo-[..]/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..] --target {target} [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", target = target )) @@ -1236,7 +1236,7 @@ fn cross_test_dylib() { [LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.0.1 ([CWD]/bar) [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] [..] (target/{arch}/debug/deps/foo-[..][EXE]) [RUNNING] [..] (target/{arch}/debug/deps/test-[..][EXE])", arch = cross_compile::alternate() diff --git a/tests/testsuite/cross_publish.rs b/tests/testsuite/cross_publish.rs index 676c71b54f49..8dc8e929a629 100644 --- a/tests/testsuite/cross_publish.rs +++ b/tests/testsuite/cross_publish.rs @@ -46,7 +46,7 @@ fn simple_cross_package() { [PACKAGING] foo v0.0.0 ([CWD]) [VERIFYING] foo v0.0.0 ([CWD]) [COMPILING] foo v0.0.0 ([CWD]/target/package/foo-0.0.0) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [PACKAGED] 4 files, [..] ([..] compressed) ", ) @@ -111,7 +111,7 @@ fn publish_with_target() { [PACKAGING] foo v0.0.0 ([CWD]) [VERIFYING] foo v0.0.0 ([CWD]) [COMPILING] foo v0.0.0 ([CWD]/target/package/foo-0.0.0) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [PACKAGED] [..] [UPLOADING] foo v0.0.0 ([CWD]) [UPLOADED] foo v0.0.0 to registry `crates-io` diff --git a/tests/testsuite/custom_target.rs b/tests/testsuite/custom_target.rs index 191d4cd517a2..a17deb50c817 100644 --- a/tests/testsuite/custom_target.rs +++ b/tests/testsuite/custom_target.rs @@ -246,13 +246,13 @@ fn custom_target_ignores_filepath() { .with_stderr( "\ [..]Compiling foo v0.0.1 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); // But not the second time, even though the path to the custom target is dfferent. p.cargo("build --lib --target b/custom-target.json") - .with_stderr("[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]") + .with_stderr("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]") .run(); } diff --git a/tests/testsuite/dep_info.rs b/tests/testsuite/dep_info.rs index f53f002ecb48..4741ebd2b1f3 100644 --- a/tests/testsuite/dep_info.rs +++ b/tests/testsuite/dep_info.rs @@ -357,7 +357,7 @@ fn relative_depinfo_paths_ws() { p.cargo("build -Z binary-dep-depinfo --target") .arg(&host) .masquerade_as_nightly_cargo(&["binary-dep-depinfo"]) - .with_stderr("[FINISHED] `dev` profile [..]") + .with_stderr("[FINISHED] dev [..]") .run(); } @@ -479,7 +479,7 @@ fn relative_depinfo_paths_no_ws() { // Make sure it stays fresh. p.cargo("build -Z binary-dep-depinfo") .masquerade_as_nightly_cargo(&["binary-dep-depinfo"]) - .with_stderr("[FINISHED] `dev` profile [..]") + .with_stderr("[FINISHED] dev [..]") .run(); } diff --git a/tests/testsuite/directory.rs b/tests/testsuite/directory.rs index 3af475a358a2..927718d31785 100644 --- a/tests/testsuite/directory.rs +++ b/tests/testsuite/directory.rs @@ -151,7 +151,7 @@ fn simple_install() { [LOCKING] 2 packages to latest compatible versions [COMPILING] foo v0.0.1 [COMPILING] bar v0.1.0 -[FINISHED] `release` profile [optimized] target(s) in [..]s +[FINISHED] release [optimized] target(s) in [..]s [INSTALLING] [..]bar[..] [INSTALLED] package `bar v0.1.0` (executable `bar[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -247,7 +247,7 @@ fn install_without_feature_dep() { [LOCKING] 2 packages to latest compatible versions [COMPILING] foo v0.0.1 [COMPILING] bar v0.1.0 -[FINISHED] `release` profile [optimized] target(s) in [..]s +[FINISHED] release [optimized] target(s) in [..]s [INSTALLING] [..]bar[..] [INSTALLED] package `bar v0.1.0` (executable `bar[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries diff --git a/tests/testsuite/docscrape.rs b/tests/testsuite/docscrape.rs index d799490585d1..a5099fe87ffe 100644 --- a/tests/testsuite/docscrape.rs +++ b/tests/testsuite/docscrape.rs @@ -26,7 +26,7 @@ fn basic() { [CHECKING] foo v0.0.1 ([CWD]) [SCRAPING] foo v0.0.1 ([CWD]) [DOCUMENTING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -405,7 +405,7 @@ fn cache() { [CHECKING] foo v0.0.1 ([CWD]) [SCRAPING] foo v0.0.1 ([CWD]) [DOCUMENTING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -415,7 +415,7 @@ fn cache() { .masquerade_as_nightly_cargo(&["rustdoc-scrape-examples"]) .with_stderr( "\ -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -459,7 +459,7 @@ warning: failed to scan example \"ex2\" in package `foo` for example code usage If an example should not be scanned, then consider adding `doc-scrape-examples = false` to its `[[example]]` definition in Cargo.toml warning: `foo` (example \"ex2\") generated 1 warning [DOCUMENTING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -527,7 +527,7 @@ warning: failed to scan example \"ex1\" in package `foo` for example code usage If an example should not be scanned, then consider adding `doc-scrape-examples = false` to its `[[example]]` definition in Cargo.toml warning: `foo` (example \"ex1\") generated 1 warning [DOCUMENTING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -552,7 +552,7 @@ error: expected one of `!` or `::`, found `NOT` | ^^^ expected one of `!` or `::` [DOCUMENTING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -608,7 +608,7 @@ warning: Rustdoc did not scrape the following examples because they require dev- If you want Rustdoc to scrape these examples, then add `doc-scrape-examples = true` to the [[example]] target configuration of at least one example. [DOCUMENTING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -624,7 +624,7 @@ warning: Rustdoc did not scrape the following examples because they require dev- [DOCUMENTING] a v0.0.1 ([CWD]/a) [SCRAPING] foo v0.0.1 ([CWD]) [DOCUMENTING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/ex/index.html ", ) @@ -676,7 +676,7 @@ fn use_dev_deps_if_explicitly_enabled() { [CHECKING] a v0.0.1 ([CWD]/a) [SCRAPING] foo v0.0.1 ([CWD]) [DOCUMENTING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) diff --git a/tests/testsuite/features.rs b/tests/testsuite/features.rs index 0b83f31af2e9..278a032985fa 100644 --- a/tests/testsuite/features.rs +++ b/tests/testsuite/features.rs @@ -529,7 +529,7 @@ fn no_feature_doesnt_build() { "\ [LOCKING] 2 packages to latest compatible versions [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -543,7 +543,7 @@ fn no_feature_doesnt_build() { [DIRTY-MSVC] foo v0.0.1 ([CWD]): the list of features changed [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc --crate-name foo [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -591,7 +591,7 @@ fn default_feature_pulled_in() { [LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.0.1 ([CWD]/bar) [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -603,7 +603,7 @@ fn default_feature_pulled_in() { [DIRTY-MSVC] foo v0.0.1 ([CWD]): the list of features changed [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc --crate-name foo [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -719,7 +719,7 @@ fn groups_on_groups_on_groups() { [CHECKING] ba[..] v0.0.1 ([CWD]/ba[..]) [CHECKING] ba[..] v0.0.1 ([CWD]/ba[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -770,7 +770,7 @@ fn many_cli_features() { [CHECKING] ba[..] v0.0.1 ([CWD]/ba[..]) [CHECKING] ba[..] v0.0.1 ([CWD]/ba[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -857,7 +857,7 @@ fn union_features() { [CHECKING] d2 v0.0.1 ([CWD]/d2) [CHECKING] d1 v0.0.1 ([CWD]/d1) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -905,7 +905,7 @@ fn many_features_no_rebuilds() { [LOCKING] 2 packages to latest compatible versions [CHECKING] a v0.1.0 ([CWD]/a) [CHECKING] b v0.1.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -916,7 +916,7 @@ fn many_features_no_rebuilds() { "\ [FRESH] a v0.1.0 ([..]/a) [FRESH] b v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1187,7 +1187,7 @@ fn optional_and_dev_dep() { "\ [LOCKING] 2 packages to latest compatible versions [CHECKING] test v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1467,7 +1467,7 @@ fn many_cli_features_comma_delimited() { [CHECKING] ba[..] v0.0.1 ([CWD]/ba[..]) [CHECKING] ba[..] v0.0.1 ([CWD]/ba[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1536,7 +1536,7 @@ fn many_cli_features_comma_and_space_delimited() { [CHECKING] ba[..] v0.0.1 ([CWD]/ba[..]) [CHECKING] ba[..] v0.0.1 ([CWD]/ba[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1704,7 +1704,7 @@ fn warn_if_default_features() { [WARNING] `default-features = [".."]` was found in [features]. Did you mean to use `default = [".."]`? [LOCKING] 2 packages to latest compatible versions [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] "#.trim(), ).run(); } diff --git a/tests/testsuite/features2.rs b/tests/testsuite/features2.rs index 9d696978f918..0843d56ba6e2 100644 --- a/tests/testsuite/features2.rs +++ b/tests/testsuite/features2.rs @@ -1124,7 +1124,7 @@ fn proc_macro_ws() { "\ [FRESH] foo v0.1.0 [..] [FRESH] pm v0.1.0 [..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -2647,7 +2647,7 @@ fn dep_with_optional_host_deps_activated() { [COMPILING] serde_derive v0.1.0 ([CWD]/serde_derive) [COMPILING] serde v0.1.0 ([CWD]/serde) [CHECKING] foo v0.1.0 ([CWD]) -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs index e76a2d1a3f07..08d2e63fe237 100644 --- a/tests/testsuite/fix.rs +++ b/tests/testsuite/fix.rs @@ -919,7 +919,7 @@ fn fix_overlapping() { [CHECKING] foo [..] [MIGRATING] src/lib.rs from 2015 edition to 2018 [FIXED] src/lib.rs (2 fixes) -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -1105,7 +1105,7 @@ fn doesnt_rebuild_dependencies() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.0 ([..]) [CHECKING] foo v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1116,7 +1116,7 @@ fn doesnt_rebuild_dependencies() { .with_stderr( "\ [CHECKING] foo v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1212,7 +1212,7 @@ fn only_warn_for_relevant_crates() { [CHECKING] a v0.1.0 ([..]) [CHECKING] foo v0.1.0 ([..]) [MIGRATING] src/lib.rs from 2015 edition to 2018 -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/inheritable_workspace_fields.rs b/tests/testsuite/inheritable_workspace_fields.rs index 9b6c3fbcf8ec..0b9e377ea538 100644 --- a/tests/testsuite/inheritable_workspace_fields.rs +++ b/tests/testsuite/inheritable_workspace_fields.rs @@ -53,7 +53,7 @@ fn permit_additional_workspace_fields() { .with_stderr( "\ [CHECKING] bar v0.1.0 ([CWD]/bar) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -297,7 +297,7 @@ fn inherit_own_dependencies() { [DOWNLOADED] dep-build v0.8.2 ([..]) [CHECKING] dep v0.1.2 [CHECKING] bar v0.2.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -458,7 +458,7 @@ fn inherit_own_detailed_dependencies() { [DOWNLOADED] dep v0.1.2 ([..]) [CHECKING] dep v0.1.2 [CHECKING] bar v0.2.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -642,7 +642,7 @@ fn inherited_dependencies_union_features() { [CHECKING] [..] [CHECKING] dep v0.1.0 [CHECKING] bar v0.2.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -869,7 +869,7 @@ fn inherit_dependencies() { [DOWNLOADED] dep-build v0.8.2 ([..]) [CHECKING] dep v0.1.2 [CHECKING] bar v0.2.0 ([CWD]/bar) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1033,7 +1033,7 @@ fn inherit_target_dependencies() { [DOWNLOADED] dep v0.1.2 ([..]) [CHECKING] dep v0.1.2 [CHECKING] bar v0.2.0 ([CWD]/bar) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1078,7 +1078,7 @@ fn inherit_dependency_override_optional() { [UPDATING] `[..]` index [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.2.0 ([CWD]/bar) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1127,7 +1127,7 @@ fn inherit_dependency_features() { [CHECKING] fancy_dep v0.2.4 [CHECKING] dep v0.1.0 [CHECKING] bar v0.2.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1196,7 +1196,7 @@ fn inherit_detailed_dependencies() { [LOCKING] 2 packages to latest compatible versions [CHECKING] detailed v0.5.0 ({}?branch=branchy#[..])\n\ [CHECKING] bar v0.2.0 ([CWD]/bar)\n\ -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]\n", +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n", path2url(&git_root), path2url(&git_root), )) @@ -1239,7 +1239,7 @@ fn inherit_path_dependencies() { [LOCKING] 2 packages to latest compatible versions [CHECKING] dep v0.9.0 ([CWD]/dep) [CHECKING] bar v0.2.0 ([CWD]/bar) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1512,7 +1512,7 @@ true for `workspace.dependencies.dep`, this could become a hard error in the fut [CHECKING] fancy_dep v0.2.4 [CHECKING] dep v0.1.0 [CHECKING] bar v0.2.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1612,7 +1612,7 @@ not specified for `workspace.dependencies.dep`, this could become a hard error i [CHECKING] fancy_dep v0.2.4 [CHECKING] dep v0.1.0 [CHECKING] bar v0.2.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1710,7 +1710,7 @@ fn inherit_def_feat_false_member_def_feat_true() { [CHECKING] fancy_dep v0.2.4 [CHECKING] dep v0.1.0 [CHECKING] bar v0.2.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1796,7 +1796,7 @@ fn warn_inherit_unused_manifest_key_dep() { [DOWNLOADED] dep v0.1.0 ([..]) [CHECKING] [..] [CHECKING] bar v0.2.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1828,7 +1828,7 @@ fn warn_unused_workspace_package_field() { "\ [WARNING] [CWD]/Cargo.toml: unused manifest key: workspace.package.name [CHECKING] foo v0.0.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1899,7 +1899,7 @@ fn warn_inherit_unused_manifest_key_package() { [WARNING] [CWD]/Cargo.toml: unused manifest key: package.rust-version.xyz [WARNING] [CWD]/Cargo.toml: unused manifest key: package.version.xyz [CHECKING] bar v1.2.3 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index ef3f4f3ae604..e45bd5dbcd85 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -43,7 +43,7 @@ fn simple() { [DOWNLOADED] foo v0.0.1 (registry [..]) [INSTALLING] foo v0.0.1 [COMPILING] foo v0.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -70,7 +70,7 @@ fn install_the_same_version_twice() { [DOWNLOADED] foo v0.0.1 (registry [..]) [INSTALLING] foo v0.0.1 [COMPILING] foo v0.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -118,7 +118,7 @@ fn simple_with_message_format() { [DOWNLOADED] foo v0.0.1 (registry [..]) [INSTALLING] foo v0.0.1 [COMPILING] foo v0.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -197,7 +197,7 @@ fn with_index() { [DOWNLOADED] foo v0.0.1 (registry `{reg}`) [INSTALLING] foo v0.0.1 (registry `{reg}`) [COMPILING] foo v0.0.1 (registry `{reg}`) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1 (registry `{reg}`)` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -230,12 +230,12 @@ fn multiple_pkgs() { [ERROR] could not find `baz` in registry `[..]` with version `*` [INSTALLING] foo v0.0.1 [COMPILING] foo v0.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`) [INSTALLING] bar v0.0.2 [COMPILING] bar v0.0.2 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/bar[EXE] [INSTALLED] package `bar v0.0.2` (executable `bar[EXE]`) [SUMMARY] Successfully installed foo, bar! Failed to install baz (see error(s) above). @@ -290,12 +290,12 @@ fn multiple_pkgs_path_set() { [ERROR] could not find `baz` in registry `[..]` with version `*` [INSTALLING] foo v0.0.1 [COMPILING] foo v0.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`) [INSTALLING] bar v0.0.2 [COMPILING] bar v0.0.2 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/bar[EXE] [INSTALLED] package `bar v0.0.2` (executable `bar[EXE]`) [SUMMARY] Successfully installed foo, bar! Failed to install baz (see error(s) above). @@ -336,7 +336,7 @@ fn pick_max_version() { [DOWNLOADED] foo v0.2.1 (registry [..]) [INSTALLING] foo v0.2.1 [COMPILING] foo v0.2.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.2.1` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -489,7 +489,7 @@ fn install_path() { .with_stderr( "\ [INSTALLING] foo v0.0.1 [..] -[FINISHED] `release` profile [..] +[FINISHED] release [..] [REPLACING] [..]/.cargo/bin/foo[EXE] [REPLACED] package `foo v0.0.1 [..]` with `foo v0.0.1 [..]` (executable `foo[EXE]`) [WARNING] be sure to add [..] @@ -508,7 +508,7 @@ fn install_target_dir() { [WARNING] Using `cargo install` [..] [INSTALLING] foo v0.0.1 [..] [COMPILING] foo v0.0.1 [..] -[FINISHED] `release` profile [..] +[FINISHED] release [..] [INSTALLING] [..]foo[EXE] [INSTALLED] package `foo v0.0.1 [..]foo[..]` (executable `foo[EXE]`) [WARNING] be sure to add [..] @@ -585,7 +585,7 @@ fn install_relative_path_outside_current_ws() { "\ [INSTALLING] foo v0.0.1 ([..]/bar/foo) [COMPILING] foo v0.0.1 ([..]/bar/foo) -[FINISHED] `release` profile [..] +[FINISHED] release [..] [INSTALLING] {home}/bin/foo[EXE] [INSTALLED] package `foo v0.0.1 ([..]/bar/foo)` (executable `foo[EXE]`) [WARNING] be sure to add [..] @@ -898,7 +898,7 @@ fn install_force() { "\ [INSTALLING] foo v0.2.0 ([..]) [COMPILING] foo v0.2.0 ([..]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [REPLACING] [CWD]/home/.cargo/bin/foo[EXE] [REPLACED] package `foo v0.0.1 ([..]/foo)` with `foo v0.2.0 ([..]/foo2)` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -938,7 +938,7 @@ fn install_force_partial_overlap() { "\ [INSTALLING] foo v0.2.0 ([..]) [COMPILING] foo v0.2.0 ([..]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo-bin3[EXE] [REPLACING] [CWD]/home/.cargo/bin/foo-bin2[EXE] [REMOVING] executable `[..]/bin/foo-bin1[EXE]` from previous version foo v0.0.1 [..] @@ -982,7 +982,7 @@ fn install_force_bin() { "\ [INSTALLING] foo v0.2.0 ([..]) [COMPILING] foo v0.2.0 ([..]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [REPLACING] [CWD]/home/.cargo/bin/foo-bin2[EXE] [REPLACED] package `foo v0.0.1 ([..]/foo)` with `foo v0.2.0 ([..]/foo2)` (executable `foo-bin2[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -1036,7 +1036,7 @@ fn git_repo() { [WARNING] no Cargo.lock file published in foo v0.1.0 ([..]) [INSTALLING] foo v0.1.0 ([..]) [COMPILING] foo v0.1.0 ([..]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.1.0 ([..]/foo#[..])` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -1240,7 +1240,7 @@ fn uninstall_cwd() { "\ [INSTALLING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] {home}/bin/foo[EXE] [INSTALLED] package `foo v0.0.1 ([..]/foo)` (executable `foo[EXE]`) [WARNING] be sure to add `{home}/bin` to your PATH to be able to run the installed binaries", @@ -1295,7 +1295,7 @@ fn do_not_rebuilds_on_local_install() { .with_stderr( "\ [INSTALLING] [..] -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [..] [INSTALLED] package `foo v0.0.1 ([..]/foo)` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -1928,7 +1928,7 @@ fn workspace_uses_workspace_target_dir() { .arg(p.root().join("bar")) .with_stderr( "[INSTALLING] [..] -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [..] [INSTALLED] package `bar v0.1.0 ([..]/bar)` (executable `bar[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -2170,7 +2170,7 @@ workspace: [..]/foo/Cargo.toml [DOWNLOADED] foo v0.1.0 (registry [..]) [INSTALLING] foo v0.1.0 [COMPILING] foo v0.1.0 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [..]foo[EXE] [INSTALLED] package `foo v0.1.0` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -2272,7 +2272,7 @@ fn no_auto_fix_note() { [DOWNLOADED] auto_fix v0.0.1 (registry [..]) [INSTALLING] auto_fix v0.0.1 [COMPILING] auto_fix v0.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/auto_fix[EXE] [INSTALLED] package `auto_fix v0.0.1` (executable `auto_fix[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -2344,7 +2344,7 @@ fn sparse_install() { [INSTALLING] foo v0.0.1 (registry `dummy-registry`) [UPDATING] `dummy-registry` index [COMPILING] foo v0.0.1 (registry `dummy-registry`) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [ROOT]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1 (registry `dummy-registry`)` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -2417,7 +2417,7 @@ fn self_referential() { [DOWNLOADED] foo v0.0.1 (registry [..]) [COMPILING] foo v0.0.1 [COMPILING] foo v0.0.2 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.2` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -2463,7 +2463,7 @@ fn ambiguous_registry_vs_local_package() { [DOWNLOADED] foo v0.0.1 (registry [..]) [COMPILING] foo v0.0.1 [COMPILING] foo v0.1.0 ([..]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.1.0 ([..])` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -2563,7 +2563,7 @@ fn uninstall_running_binary() { [DOWNLOADED] foo v0.0.1 (registry [..]) [INSTALLING] foo v0.0.1 [COMPILING] foo v0.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries @@ -2619,7 +2619,7 @@ fn uninstall_running_binary() { [UPDATING] `[..]` index [INSTALLING] foo v0.0.1 [COMPILING] foo v0.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`) [WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries diff --git a/tests/testsuite/install_upgrade.rs b/tests/testsuite/install_upgrade.rs index bd3094a86c40..fe4f8c6c705f 100644 --- a/tests/testsuite/install_upgrade.rs +++ b/tests/testsuite/install_upgrade.rs @@ -133,7 +133,7 @@ fn registry_upgrade() { [DOWNLOADED] foo v1.0.0 (registry [..]) [INSTALLING] foo v1.0.0 [COMPILING] foo v1.0.0 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/foo[EXE] [INSTALLED] package `foo v1.0.0` (executable `foo[EXE]`) [WARNING] be sure to add [..] @@ -163,7 +163,7 @@ fn registry_upgrade() { [DOWNLOADED] foo v1.0.1 (registry [..]) [INSTALLING] foo v1.0.1 [COMPILING] foo v1.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [REPLACING] [CWD]/home/.cargo/bin/foo[EXE] [REPLACED] package `foo v1.0.0` with `foo v1.0.1` (executable `foo[EXE]`) [WARNING] be sure to add [..] @@ -213,7 +213,7 @@ fn upgrade_force() { [UPDATING] `[..]` index [INSTALLING] foo v1.0.0 [COMPILING] foo v1.0.0 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [REPLACING] [..]/.cargo/bin/foo[EXE] [REPLACED] package `foo v1.0.0` with `foo v1.0.0` (executable `foo[EXE]`) [WARNING] be sure to add `[..]/.cargo/bin` to your PATH [..] @@ -603,17 +603,17 @@ fn multiple_report() { [DOWNLOADED] three v1.0.0 (registry `[..]`) [INSTALLING] one v1.0.0 [COMPILING] one v1.0.0 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [..]/.cargo/bin/one[EXE] [INSTALLED] package `one v1.0.0` (executable `one[EXE]`) [INSTALLING] two v1.0.0 [COMPILING] two v1.0.0 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [..]/.cargo/bin/two[EXE] [INSTALLED] package `two v1.0.0` (executable `two[EXE]`) [INSTALLING] three v1.0.0 [COMPILING] three v1.0.0 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [..]/.cargo/bin/three[EXE] [INSTALLING] [..]/.cargo/bin/x[EXE] [INSTALLING] [..]/.cargo/bin/y[EXE] @@ -636,7 +636,7 @@ fn multiple_report() { [DOWNLOADED] three v1.0.1 (registry `[..]`) [INSTALLING] three v1.0.1 [COMPILING] three v1.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [REPLACING] [..]/.cargo/bin/three[EXE] [REPLACING] [..]/.cargo/bin/x[EXE] [REPLACING] [..]/.cargo/bin/y[EXE] @@ -661,7 +661,7 @@ fn multiple_report() { [UPDATING] `[..]` index [INSTALLING] three v1.0.1 [COMPILING] three v1.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [..]/.cargo/bin/x[EXE] [INSTALLED] package `three v1.0.1` (executable `x[EXE]`) [WARNING] be sure to add `[..]/.cargo/bin` to your PATH [..] @@ -674,7 +674,7 @@ fn multiple_report() { [UPDATING] `[..]` index [INSTALLING] three v1.0.1 [COMPILING] three v1.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [..]/.cargo/bin/three[EXE] [INSTALLING] [..]/.cargo/bin/y[EXE] [REPLACING] [..]/.cargo/bin/x[EXE] @@ -739,7 +739,7 @@ fn deletes_orphaned() { "\ [INSTALLING] foo v0.2.0 [..] [COMPILING] foo v0.2.0 [..] -[FINISHED] `release` profile [..] +[FINISHED] release [..] [INSTALLING] [..]/.cargo/bin/ex2[EXE] [REPLACING] [..]/.cargo/bin/ex1[EXE] [REPLACING] [..]/.cargo/bin/foo[EXE] @@ -787,7 +787,7 @@ fn already_installed_exact_does_not_update() { [DOWNLOADED] foo v1.0.1 (registry [..]) [INSTALLING] foo v1.0.1 [COMPILING] foo v1.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [REPLACING] [CWD]/home/.cargo/bin/foo[EXE] [REPLACED] package `foo v1.0.0` with `foo v1.0.1` (executable `foo[EXE]`) [WARNING] be sure to add [..] @@ -822,7 +822,7 @@ fn already_installed_updates_yank_status_on_upgrade() { [DOWNLOADED] foo v1.0.1 (registry [..]) [INSTALLING] foo v1.0.1 [COMPILING] foo v1.0.1 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [REPLACING] [CWD]/home/.cargo/bin/foo[EXE] [REPLACED] package `foo v1.0.0` with `foo v1.0.1` (executable `foo[EXE]`) [WARNING] be sure to add [..] @@ -848,12 +848,12 @@ fn partially_already_installed_does_one_update() { [DOWNLOADED] baz v1.0.0 (registry [..]) [INSTALLING] bar v1.0.0 [COMPILING] bar v1.0.0 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/bar[EXE] [INSTALLED] package `bar v1.0.0` (executable `bar[EXE]`) [INSTALLING] baz v1.0.0 [COMPILING] baz v1.0.0 -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [INSTALLING] [CWD]/home/.cargo/bin/baz[EXE] [INSTALLED] package `baz v1.0.0` (executable `baz[EXE]`) [SUMMARY] Successfully installed foo, bar, baz! diff --git a/tests/testsuite/lints_table.rs b/tests/testsuite/lints_table.rs index 6ebdda1a35b7..263df0b9850b 100644 --- a/tests/testsuite/lints_table.rs +++ b/tests/testsuite/lints_table.rs @@ -175,7 +175,7 @@ fn warn_on_unused_key() { [WARNING] [CWD]/Cargo.toml: unused manifest key: lints.rust.rust-2018-idioms.unused [WARNING] [CWD]/Cargo.toml: unused manifest key: workspace.lints.rust.rust-2018-idioms.unused [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -733,7 +733,7 @@ pub const Ĕ: i32 = 2; .with_stderr( "\ [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -742,7 +742,7 @@ pub const Ĕ: i32 = 2; .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] test [unoptimized + debuginfo] target(s) in [..]s [DOCTEST] foo ", ) diff --git a/tests/testsuite/lockfile_compat.rs b/tests/testsuite/lockfile_compat.rs index bb724f94305b..183e1a857ad0 100644 --- a/tests/testsuite/lockfile_compat.rs +++ b/tests/testsuite/lockfile_compat.rs @@ -1060,7 +1060,7 @@ dependencies = [ [ADDING] foo v0.0.1 ([CWD]) [CHECKING] dep1 v0.5.0 ({url}?{ref_kind}={git_ref}#[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] " )) .run(); @@ -1075,7 +1075,7 @@ dependencies = [ .with_stderr(format!( "\ [UPDATING] git repository `{url}` -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] " )) .run(); @@ -1156,7 +1156,7 @@ dependencies = [ [ADDING] foo v0.0.1 ([CWD]) [CHECKING] dep1 v0.5.0 ({url}?{ref_kind}={git_ref}#[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] " )) .run(); @@ -1166,9 +1166,7 @@ dependencies = [ // Unlike v3_and_git_url_encoded, v4 encodes URL parameters so no git // repository re-clone happen. - p.cargo("check") - .with_stderr("[FINISHED] `dev` profile [..]") - .run(); + p.cargo("check").with_stderr("[FINISHED] dev [..]").run(); } #[cargo_test] diff --git a/tests/testsuite/lto.rs b/tests/testsuite/lto.rs index c6958fc6fe81..2a48b58f98e1 100644 --- a/tests/testsuite/lto.rs +++ b/tests/testsuite/lto.rs @@ -745,7 +745,7 @@ fn doctest() { "\ [FRESH] bar v0.1.0 [..] [FRESH] foo v0.1.0 [..] -[FINISHED] `release` profile [..] +[FINISHED] release [..] [DOCTEST] foo [RUNNING] `rustdoc [..]-C lto[..] ", diff --git a/tests/testsuite/metabuild.rs b/tests/testsuite/metabuild.rs index f480d577097d..55a15cce7ff8 100644 --- a/tests/testsuite/metabuild.rs +++ b/tests/testsuite/metabuild.rs @@ -287,7 +287,7 @@ fn metabuild_fresh() { "\ [FRESH] mb [..] [FRESH] foo [..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); diff --git a/tests/testsuite/multitarget.rs b/tests/testsuite/multitarget.rs index 68a32dd060e7..30be9e97dbf3 100644 --- a/tests/testsuite/multitarget.rs +++ b/tests/testsuite/multitarget.rs @@ -131,7 +131,7 @@ fn simple_doc_open() { .with_stderr( "\ [DOCUMENTING] foo v1.0.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [ERROR] only one `--target` argument is supported", ) .with_status(101) diff --git a/tests/testsuite/offline.rs b/tests/testsuite/offline.rs index 8e6d4e19362e..5cc8242acb14 100644 --- a/tests/testsuite/offline.rs +++ b/tests/testsuite/offline.rs @@ -147,7 +147,7 @@ fn cargo_compile_with_downloaded_dependency_with_offline() { [LOCKING] 2 packages to latest compatible versions [CHECKING] present_dep v1.2.3 [CHECKING] bar v0.1.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]", +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]", ) .run(); } @@ -257,7 +257,7 @@ fn main(){ [LOCKING] 2 packages to latest compatible versions [COMPILING] present_dep v1.2.3 [COMPILING] foo v0.1.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] Running `[..]`", ) .with_stdout("1.2.3") @@ -506,7 +506,7 @@ fn compile_offline_with_cached_git_dep(shallow: bool) { [LOCKING] 2 packages to latest compatible versions [COMPILING] dep1 v0.5.0 ({}#[..]) [COMPILING] foo v0.5.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]", +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]", path2url(git_root), )); maybe_use_shallow(cargo).run(); @@ -690,7 +690,7 @@ fn main(){ [LOCKING] 2 packages to latest compatible versions [COMPILING] present_dep v1.2.9 [COMPILING] foo v0.1.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -712,7 +712,7 @@ fn main(){ "\ [COMPILING] present_dep v1.2.3 [COMPILING] foo v0.1.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/patch.rs b/tests/testsuite/patch.rs index f1fc5600fb91..022548bd86c0 100644 --- a/tests/testsuite/patch.rs +++ b/tests/testsuite/patch.rs @@ -60,7 +60,7 @@ fn replace() { [CHECKING] bar v0.1.0 ([CWD]/bar) [CHECKING] baz v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -105,7 +105,7 @@ fn from_config() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.1 ([..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -148,7 +148,7 @@ fn from_config_relative() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.1 ([..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -194,7 +194,7 @@ fn from_config_precedence() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.1 ([..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -236,7 +236,7 @@ fn nonexistent() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.0 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -285,7 +285,7 @@ fn patch_git() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.0 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -335,7 +335,7 @@ fn patch_to_git() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.0 (file://[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -383,7 +383,7 @@ version. [..] [DOWNLOADED] bar v0.1.0 [..] [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -462,7 +462,7 @@ version. [..] [DOWNLOADED] bar v0.1.0 [..] [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -501,7 +501,7 @@ fn prefer_patch_version() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.1 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -564,7 +564,7 @@ version. [..] [DOWNLOADED] bar v0.1.0 [..] [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -640,7 +640,7 @@ version. [..] [DOWNLOADED] bar v0.1.0 [..] [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -690,7 +690,7 @@ fn add_patch() { [DOWNLOADED] bar v0.1.0 [..] [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -720,7 +720,7 @@ fn add_patch() { [ADDING] bar v0.1.0 ([CWD]/bar) [CHECKING] bar v0.1.0 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -759,7 +759,7 @@ fn add_patch_from_config() { [DOWNLOADED] bar v0.1.0 [..] [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -780,7 +780,7 @@ fn add_patch_from_config() { [ADDING] bar v0.1.0 ([CWD]/bar) [CHECKING] bar v0.1.0 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -819,7 +819,7 @@ fn add_ignored_patch() { [DOWNLOADED] bar v0.1.0 [..] [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -850,7 +850,7 @@ Check that [..] with the [..] what is [..] version. [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]", +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]", ) .run(); p.cargo("check") @@ -871,7 +871,7 @@ version. [..] "\ [CHECKING] bar v0.1.1 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -912,7 +912,7 @@ default-features and features will not take effect because the patch dependency [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.0 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -962,7 +962,7 @@ default-features and features will not take effect because the patch dependency [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.0 ([CWD]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1056,7 +1056,7 @@ fn new_minor() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.1.1 [..] [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1110,7 +1110,7 @@ fn transitive_new_minor() { [CHECKING] baz v0.1.1 [..] [CHECKING] bar v0.1.0 [..] [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1149,7 +1149,7 @@ fn new_major() { [LOCKING] 2 packages to latest compatible versions [CHECKING] bar v0.2.0 [..] [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1157,7 +1157,7 @@ fn new_major() { Package::new("bar", "0.2.0").publish(); p.cargo("update").run(); p.cargo("check") - .with_stderr("[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]") + .with_stderr("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]") .run(); p.change_file( @@ -1183,7 +1183,7 @@ fn new_major() { [DOWNLOADED] bar v0.2.0 [..] [CHECKING] bar v0.2.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1237,7 +1237,7 @@ fn transitive_new_major() { [CHECKING] baz v0.2.0 [..] [CHECKING] bar v0.1.0 [..] [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1297,7 +1297,7 @@ fn shared_by_transitive() { [CHECKING] baz v0.1.2 [..] [CHECKING] bar v0.1.0 [..] [CHECKING] foo v0.1.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/profile_config.rs b/tests/testsuite/profile_config.rs index ef76f72f2763..4ec1c6a88eb5 100644 --- a/tests/testsuite/profile_config.rs +++ b/tests/testsuite/profile_config.rs @@ -275,7 +275,7 @@ fn profile_config_all_options() { -C overflow-checks=off [..]\ -C rpath [..]\ -C incremental=[..] -[FINISHED] `release` profile [optimized + debuginfo] [..] +[FINISHED] release [optimized + debuginfo] [..] ", ) .run(); @@ -323,7 +323,7 @@ fn profile_config_override_precedence() { [RUNNING] `rustc --crate-name bar [..] -C opt-level=2[..]-C codegen-units=2 [..] [COMPILING] foo [..] [RUNNING] `rustc --crate-name foo [..]-C codegen-units=2 [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]", +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]", ) .run(); } diff --git a/tests/testsuite/profile_custom.rs b/tests/testsuite/profile_custom.rs index e906d11ccf37..715b77f6fe80 100644 --- a/tests/testsuite/profile_custom.rs +++ b/tests/testsuite/profile_custom.rs @@ -342,7 +342,7 @@ fn overrides_with_custom() { [RUNNING] `rustc --crate-name xxx [..] -C codegen-units=5 [..]` [RUNNING] `rustc --crate-name yyy [..] -C codegen-units=3 [..]` [RUNNING] `rustc --crate-name foo [..] -C codegen-units=7 [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -357,7 +357,7 @@ fn overrides_with_custom() { [RUNNING] `rustc --crate-name xxx [..] -C codegen-units=5 [..]` [RUNNING] `rustc --crate-name yyy [..] -C codegen-units=6 [..]` [RUNNING] `rustc --crate-name foo [..] -C codegen-units=2 [..]` -[FINISHED] `other` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] other [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -408,7 +408,7 @@ warning: the `--release` flag should not be specified with the `--profile` flag The `--release` flag will be ignored. This was historically accepted, but will become an error in a future release. [COMPILING] foo [..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -431,7 +431,7 @@ warning: the `--release` flag should not be specified with the `--profile` flag The `--release` flag will be ignored. This was historically accepted, but will become an error in a future release. [CHECKING] foo [..] -[FINISHED] `test` profile [..] +[FINISHED] test [..] ", ) .run(); @@ -441,7 +441,7 @@ This was historically accepted, but will become an error in a future release. .with_stderr( "\ [COMPILING] foo [..] -[FINISHED] `release` profile [..] +[FINISHED] release [..] ", ) .run(); @@ -449,7 +449,7 @@ This was historically accepted, but will become an error in a future release. p.cargo("build --profile=release --release") .with_stderr( "\ -[FINISHED] `release` profile [..] +[FINISHED] release [..] ", ) .run(); @@ -458,7 +458,7 @@ This was historically accepted, but will become an error in a future release. .with_stderr( "\ [INSTALLING] foo [..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] [INSTALLING] [..] [INSTALLED] [..] [WARNING] be sure to add [..] @@ -502,7 +502,7 @@ fn clean_custom_dirname() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([..]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", ) .run(); @@ -513,7 +513,7 @@ fn clean_custom_dirname() { .with_stdout("") .with_stderr( "\ -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", ) .run(); @@ -524,7 +524,7 @@ fn clean_custom_dirname() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([..]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] ", ) .run(); @@ -534,7 +534,7 @@ fn clean_custom_dirname() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -543,7 +543,7 @@ fn clean_custom_dirname() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([..]) -[FINISHED] `other` profile [optimized] target(s) in [..] +[FINISHED] other [optimized] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/profile_trim_paths.rs b/tests/testsuite/profile_trim_paths.rs index fbdec2a69196..14c3c6eff816 100644 --- a/tests/testsuite/profile_trim_paths.rs +++ b/tests/testsuite/profile_trim_paths.rs @@ -87,7 +87,7 @@ fn release_profile_default_to_object() { -Zremap-path-scope=object \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `release` profile [..]", +[FINISHED] release [..]", ) .run(); } @@ -126,7 +126,7 @@ fn one_option() { -Zremap-path-scope={option} \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `dev` profile [..]", +[FINISHED] dev [..]", )) .run(); } @@ -164,7 +164,7 @@ fn multiple_options() { -Zremap-path-scope=diagnostics,macro,object \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `dev` profile [..]", +[FINISHED] dev [..]", ) .run(); } @@ -200,7 +200,7 @@ fn profile_merge_works() { -Zremap-path-scope=diagnostics \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `custom` profile [..]", +[FINISHED] custom [..]", ) .run(); } @@ -252,7 +252,7 @@ fn registry_dependency() { -Zremap-path-scope=object \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] [RUNNING] `target/debug/foo[EXE]`" )) .run(); @@ -308,7 +308,7 @@ fn git_dependency() { -Zremap-path-scope=object \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] [RUNNING] `target/debug/foo[EXE]`" )) .run(); @@ -356,7 +356,7 @@ fn path_dependency() { -Zremap-path-scope=object \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] [RUNNING] `target/debug/foo[EXE]`" )) .run(); @@ -407,7 +407,7 @@ fn path_dependency_outside_workspace() { -Zremap-path-scope=object \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] [RUNNING] `target/debug/foo[EXE]`" )) .run(); @@ -591,7 +591,7 @@ fn object_works_helper(split_debuginfo: &str, run: impl Fn(&std::path::Path) -> -Zremap-path-scope=object \ --remap-path-prefix=[CWD]=. \ --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] -[FINISHED] `dev` profile [..]", +[FINISHED] dev [..]", )) .run(); diff --git a/tests/testsuite/pub_priv.rs b/tests/testsuite/pub_priv.rs index 14f32b471020..ae808fee317b 100644 --- a/tests/testsuite/pub_priv.rs +++ b/tests/testsuite/pub_priv.rs @@ -83,7 +83,7 @@ fn exported_pub_dep() { [DOWNLOADED] pub_dep v0.1.0 ([..]) [CHECKING] pub_dep v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run() @@ -339,7 +339,7 @@ fn allow_priv_in_tests() { [DOWNLOADED] priv_dep v0.1.0 ([..]) [CHECKING] priv_dep v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run() @@ -385,7 +385,7 @@ fn allow_priv_in_benchs() { [DOWNLOADED] priv_dep v0.1.0 ([..]) [CHECKING] priv_dep v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run() @@ -432,7 +432,7 @@ fn allow_priv_in_bins() { [DOWNLOADED] priv_dep v0.1.0 ([..]) [CHECKING] priv_dep v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run() @@ -479,7 +479,7 @@ fn allow_priv_in_examples() { [DOWNLOADED] priv_dep v0.1.0 ([..]) [CHECKING] priv_dep v0.1.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run() @@ -527,7 +527,7 @@ fn allow_priv_in_custom_build() { [DOWNLOADED] priv_dep v0.1.0 ([..]) [COMPILING] priv_dep v0.1.0 [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run() @@ -584,7 +584,7 @@ fn publish_package_with_public_dependency() { [CHECKING] pub_bar v0.1.0 [CHECKING] bar v0.1.0 [CHECKING] foo v0.0.1 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run() diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs index 38577bbcfdde..932b6375ed2b 100644 --- a/tests/testsuite/publish.rs +++ b/tests/testsuite/publish.rs @@ -740,7 +740,7 @@ See [..] [PACKAGING] foo v0.0.1 ([CWD]) [VERIFYING] foo v0.0.1 ([CWD]) [COMPILING] foo v0.0.1 [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [PACKAGED] [..] files, [..] ([..] compressed) [UPLOADING] foo v0.0.1 ([CWD]) [WARNING] aborting upload due to dry run diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs index 24c253c55040..a9d3f12d8bd6 100644 --- a/tests/testsuite/registry.rs +++ b/tests/testsuite/registry.rs @@ -65,7 +65,7 @@ fn simple() { [DOWNLOADED] bar v0.0.1 (registry `dummy-registry`) [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -80,7 +80,7 @@ fn simple() { "\ [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -129,7 +129,7 @@ fn deps() { [CHECKING] baz v0.0.1 [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -438,7 +438,7 @@ required by package `foo v0.0.1 ([..])` [DOWNLOADED] notyet v0.0.1 (registry `dummy-registry`) [CHECKING] notyet v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -509,7 +509,7 @@ Caused by: [DOWNLOADED] notyet v0.0.1 (registry `dummy-registry`) [COMPILING] notyet v0.0.1 [COMPILING] foo v0.0.1 ([CWD][..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [PACKAGED] [..] ", ) @@ -556,7 +556,7 @@ fn lockfile_locks() { [DOWNLOADED] bar v0.0.1 (registry `dummy-registry`) [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -610,7 +610,7 @@ fn lockfile_locks_transitively() { [CHECKING] baz v0.0.1 [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -670,7 +670,7 @@ fn yanks_are_not_used() { [CHECKING] baz v0.0.1 [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -949,7 +949,7 @@ fn update_with_lockfile_if_packages_missing() { [UPDATING] `[..]` index [DOWNLOADING] crates ... [DOWNLOADED] bar v0.0.1 (registry `dummy-registry`) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1009,7 +1009,7 @@ fn update_lockfile() { [DOWNLOADED] [..] v0.0.2 (registry `dummy-registry`) [CHECKING] bar v0.0.2 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1033,7 +1033,7 @@ fn update_lockfile() { [DOWNLOADED] [..] v0.0.3 (registry `dummy-registry`) [CHECKING] bar v0.0.3 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1107,7 +1107,7 @@ fn dev_dependency_not_used() { [DOWNLOADED] [..] v0.0.1 (registry `dummy-registry`) [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1205,7 +1205,7 @@ fn updating_a_dep() { [CHECKING] bar v0.0.1 [CHECKING] a v0.0.1 ([CWD]/a) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1244,7 +1244,7 @@ fn updating_a_dep() { [CHECKING] bar v0.1.0 [CHECKING] a v0.0.1 ([CWD]/a) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1320,7 +1320,7 @@ fn git_and_registry_dep() { [CHECKING] a v0.0.1 [CHECKING] b v0.0.1 ([..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1408,7 +1408,7 @@ fn update_publish_then_update() { [DOWNLOADED] a v0.1.1 (registry `dummy-registry`) [COMPILING] a v0.1.1 [COMPILING] foo v0.5.0 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1511,7 +1511,7 @@ fn update_transitive_dependency() { [CHECKING] b v0.1.1 [CHECKING] a v0.1.0 [CHECKING] foo v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1886,7 +1886,7 @@ fn only_download_relevant() { [DOWNLOADED] baz v0.1.0 ([..]) [CHECKING] baz v0.1.0 [CHECKING] bar v0.5.0 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -2839,7 +2839,7 @@ Caused by: "\ [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([..]) -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); @@ -2895,7 +2895,7 @@ internal server error [DOWNLOADED] bar v0.0.1 (registry `dummy-registry`) [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -3735,7 +3735,7 @@ fn differ_only_by_metadata() { [DOWNLOADED] [..] v0.0.1+b (registry `dummy-registry`) [CHECKING] baz v0.0.1+b [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -3787,7 +3787,7 @@ fn differ_only_by_metadata_with_lockfile() { [DOWNLOADED] [..] v0.0.1+b (registry `dummy-registry`) [CHECKING] baz v0.0.1+b [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); diff --git a/tests/testsuite/registry_auth.rs b/tests/testsuite/registry_auth.rs index 1ac1ba284445..4d98cdb7ee8d 100644 --- a/tests/testsuite/registry_auth.rs +++ b/tests/testsuite/registry_auth.rs @@ -44,7 +44,7 @@ static SUCCESS_OUTPUT: &'static str = "\ [DOWNLOADED] bar v0.0.1 (registry `alternative`) [COMPILING] bar v0.0.1 (registry `alternative`) [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s "; #[cargo_test] diff --git a/tests/testsuite/replace.rs b/tests/testsuite/replace.rs index 81b6c379489f..df3baf14a326 100644 --- a/tests/testsuite/replace.rs +++ b/tests/testsuite/replace.rs @@ -48,7 +48,7 @@ fn override_simple() { [LOCKING] 3 packages to latest compatible versions [CHECKING] bar v0.1.0 (file://[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -99,7 +99,7 @@ fn override_with_features() { will not take effect because the replacement dependency does not support this mechanism [CHECKING] bar v0.1.0 (file://[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -150,7 +150,7 @@ fn override_with_setting_default_features() { will not take effect because the replacement dependency does not support this mechanism [CHECKING] bar v0.1.0 (file://[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -311,7 +311,7 @@ fn transitive() { [CHECKING] bar v0.1.0 (file://[..]) [CHECKING] baz v0.2.0 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -362,7 +362,7 @@ fn persists_across_rebuilds() { [LOCKING] 3 packages to latest compatible versions [CHECKING] bar v0.1.0 (file://[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -410,7 +410,7 @@ fn replace_registry_with_path() { [LOCKING] 3 packages to latest compatible versions [CHECKING] bar v0.1.0 ([ROOT][..]/bar) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -484,7 +484,7 @@ fn use_a_spec_to_select() { [CHECKING] [..] [CHECKING] [..] [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -546,7 +546,7 @@ fn override_adds_some_deps() { [CHECKING] baz v0.1.1 [CHECKING] bar v0.1.0 ([..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1501,7 +1501,7 @@ fn override_spec_metadata_is_optional() { [LOCKING] 3 packages to latest compatible versions [CHECKING] bar v0.1.0+a (file://[..]) [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs index 15ca5591ca28..0298871f0a8a 100644 --- a/tests/testsuite/run.rs +++ b/tests/testsuite/run.rs @@ -15,7 +15,7 @@ fn simple() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo[EXE]`", ) .with_stdout("hello") @@ -120,7 +120,7 @@ fn verbose_arg_and_quiet_config() { "\ [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo[EXE]`", ) .with_stdout("hello") @@ -161,7 +161,7 @@ fn verbose_config_alone() { "\ [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc [..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo[EXE]`", ) .with_stdout("hello") @@ -240,7 +240,7 @@ fn exit_code() { let mut output = String::from( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target[..]` ", ); @@ -262,7 +262,7 @@ fn exit_code_verbose() { "\ [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target[..]` ", ); @@ -336,7 +336,7 @@ fn specify_name() { [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc [..] src/lib.rs [..]` [RUNNING] `rustc [..] src/bin/a.rs [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/a[EXE]`", ) .with_stdout("hello a.rs") @@ -347,7 +347,7 @@ fn specify_name() { "\ [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] src/bin/b.rs [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/b[EXE]`", ) .with_stdout("hello b.rs") @@ -423,7 +423,7 @@ fn run_example() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/examples/a[EXE]`", ) .with_stdout("example") @@ -479,7 +479,7 @@ fn run_bin_example() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/examples/bar[EXE]`", ) .with_stdout("example") @@ -562,7 +562,7 @@ fn run_example_autodiscover_2015_with_autoexamples_enabled() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/examples/a[EXE]`", ) .with_stdout("example") @@ -592,7 +592,7 @@ fn run_example_autodiscover_2018() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/examples/a[EXE]`", ) .with_stdout("example") @@ -733,7 +733,7 @@ fn one_bin_multiple_examples() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/main[EXE]`", ) .with_stdout("hello main.rs") @@ -810,7 +810,7 @@ fn example_with_release_flag() { -C strip=debuginfo \ -L dependency=[CWD]/target/release/deps \ --extern bar=[CWD]/target/release/deps/libbar-[..].rlib` -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [RUNNING] `target/release/examples/a[EXE]` ", ) @@ -839,7 +839,7 @@ fast2", --out-dir [CWD]/target/debug/examples \ -L dependency=[CWD]/target/debug/deps \ --extern bar=[CWD]/target/debug/deps/libbar-[..].rlib` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/examples/a[EXE]` ", ) @@ -928,7 +928,7 @@ fn run_with_bin_dep() { [LOCKING] 2 packages to latest compatible versions [WARNING] foo v0.0.1 ([CWD]) ignoring invalid dependency `bar` which is missing a lib target [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo[EXE]`", ) .with_stdout("hello") @@ -990,7 +990,7 @@ fn run_with_bin_deps() { [WARNING] foo v0.0.1 ([CWD]) ignoring invalid dependency `bar1` which is missing a lib target [WARNING] foo v0.0.1 ([CWD]) ignoring invalid dependency `bar2` which is missing a lib target [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo[EXE]`", ) .with_stdout("hello") @@ -1085,7 +1085,7 @@ available binaries: bar1, bar2, foo1, foo2", [WARNING] foo1 v0.0.1 ([CWD]/foo1) ignoring invalid dependency `bar1` which is missing a lib target [WARNING] foo2 v0.0.1 ([CWD]/foo2) ignoring invalid dependency `bar2` which is missing a lib target [COMPILING] foo1 v0.0.1 ([CWD]/foo1) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `target/debug/foo1[EXE]`", ) .with_stdout("hello") @@ -1107,7 +1107,7 @@ fn release_works() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [RUNNING] `target/release/foo[EXE]` ", ) @@ -1130,7 +1130,7 @@ fn release_short_works() { .with_stderr( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `release` profile [optimized] target(s) in [..] +[FINISHED] release [optimized] target(s) in [..] [RUNNING] `target/release/foo[EXE]` ", ) @@ -1192,7 +1192,7 @@ fn run_from_executable_folder() { p.cargo("run") .cwd(cwd) .with_stderr( - "[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]\n\ + "[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]\n\ [RUNNING] `./foo[EXE]`", ) .with_stdout("hello") @@ -1496,7 +1496,7 @@ fn print_env_verbose() { "\ [COMPILING] a v0.0.1 ([CWD]) [RUNNING] `[..]CARGO_MANIFEST_DIR=[CWD][..] rustc --crate-name a[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `[..]CARGO_MANIFEST_DIR=[CWD][..] target/debug/a[EXE]`", ) .run(); diff --git a/tests/testsuite/rustdoc.rs b/tests/testsuite/rustdoc.rs index 7b72b3621ef3..96b63106f1f0 100644 --- a/tests/testsuite/rustdoc.rs +++ b/tests/testsuite/rustdoc.rs @@ -14,7 +14,7 @@ fn rustdoc_simple() { -o [CWD]/target/doc \ [..] \ -L dependency=[CWD]/target/debug/deps [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -47,7 +47,7 @@ fn rustdoc_simple_json() { "\ [DOCUMENTING] foo v0.0.1 ([CWD]) [RUNNING] `rustdoc [..]--crate-name foo [..]-o [CWD]/target/doc [..]--output-format=json[..] -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo.json ", ) @@ -118,7 +118,7 @@ fn rustdoc_args() { --cfg=foo \ -C metadata=[..] \ -L dependency=[CWD]/target/debug/deps [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -174,7 +174,7 @@ fn rustdoc_foo_with_bar_dependency() { -C metadata=[..] \ -L dependency=[CWD]/target/debug/deps \ --extern [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -216,7 +216,7 @@ fn rustdoc_only_bar_dependency() { --cfg=foo \ -C metadata=[..] \ -L dependency=[CWD]/target/debug/deps [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/bar/index.html ", ) @@ -240,7 +240,7 @@ fn rustdoc_same_name_documents_lib() { --cfg=foo \ -C metadata=[..] \ -L dependency=[CWD]/target/debug/deps [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) @@ -319,7 +319,7 @@ fn rustdoc_target() { [..] \ -L dependency=[CWD]/target/{target}/debug/deps \ -L dependency=[CWD]/target/debug/deps[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/[..]/doc/foo/index.html", target = cross_compile::alternate() )) diff --git a/tests/testsuite/rustdocflags.rs b/tests/testsuite/rustdocflags.rs index 09bba09f6f4b..35ed157bd1d2 100644 --- a/tests/testsuite/rustdocflags.rs +++ b/tests/testsuite/rustdocflags.rs @@ -51,7 +51,7 @@ fn rerun() { p.cargo("doc") .env("RUSTDOCFLAGS", "--cfg=foo") .with_stderr( - "[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] + "[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html", ) .run(); @@ -60,7 +60,7 @@ fn rerun() { .with_stderr( "\ [DOCUMENTING] foo v0.0.1 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [GENERATED] [CWD]/target/doc/foo/index.html ", ) diff --git a/tests/testsuite/rustflags.rs b/tests/testsuite/rustflags.rs index 1f7ca1bd7eaf..4346ca04f427 100644 --- a/tests/testsuite/rustflags.rs +++ b/tests/testsuite/rustflags.rs @@ -1273,7 +1273,7 @@ fn cfg_rustflags_normal_source() { "\ [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1283,7 +1283,7 @@ fn cfg_rustflags_normal_source() { "\ [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1293,7 +1293,7 @@ fn cfg_rustflags_normal_source() { "\ [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1305,7 +1305,7 @@ fn cfg_rustflags_normal_source() { [RUNNING] `rustc [..] --cfg bar[..]` [RUNNING] `rustc [..] --cfg bar[..]` [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [EXECUTABLE] `[..]/target/debug/deps/foo-[..][EXE]` [EXECUTABLE] `[..]/target/debug/deps/a-[..][EXE]` [EXECUTABLE] `[..]/target/debug/deps/c-[..][EXE]` @@ -1320,7 +1320,7 @@ fn cfg_rustflags_normal_source() { [RUNNING] `rustc [..] --cfg bar[..]` [RUNNING] `rustc [..] --cfg bar[..]` [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [EXECUTABLE] `[..]/target/release/deps/foo-[..][EXE]` [EXECUTABLE] `[..]/target/release/deps/a-[..][EXE]` ", @@ -1360,7 +1360,7 @@ fn cfg_rustflags_precedence() { "\ [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1370,7 +1370,7 @@ fn cfg_rustflags_precedence() { "\ [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1380,7 +1380,7 @@ fn cfg_rustflags_precedence() { "\ [COMPILING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1392,7 +1392,7 @@ fn cfg_rustflags_precedence() { [RUNNING] `rustc [..] --cfg bar[..]` [RUNNING] `rustc [..] --cfg bar[..]` [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [EXECUTABLE] `[..]/target/debug/deps/foo-[..][EXE]` [EXECUTABLE] `[..]/target/debug/deps/a-[..][EXE]` [EXECUTABLE] `[..]/target/debug/deps/c-[..][EXE]` @@ -1407,7 +1407,7 @@ fn cfg_rustflags_precedence() { [RUNNING] `rustc [..] --cfg bar[..]` [RUNNING] `rustc [..] --cfg bar[..]` [RUNNING] `rustc [..] --cfg bar[..]` -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [EXECUTABLE] `[..]/target/release/deps/foo-[..][EXE]` [EXECUTABLE] `[..]/target/release/deps/a-[..][EXE]` ", @@ -1433,7 +1433,7 @@ fn target_rustflags_string_and_array_form1() { "\ [CHECKING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg foo[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1454,7 +1454,7 @@ fn target_rustflags_string_and_array_form1() { "\ [CHECKING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg foo[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1481,7 +1481,7 @@ fn target_rustflags_string_and_array_form2() { "\ [CHECKING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg foo[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -1505,7 +1505,7 @@ fn target_rustflags_string_and_array_form2() { "\ [CHECKING] foo v0.0.1 ([..]) [RUNNING] `rustc [..] --cfg foo[..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); diff --git a/tests/testsuite/script.rs b/tests/testsuite/script.rs index c3abefe455cc..8741dd0d23de 100644 --- a/tests/testsuite/script.rs +++ b/tests/testsuite/script.rs @@ -37,7 +37,7 @@ args: [] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] echo v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/echo[EXE]` ", ) @@ -61,7 +61,7 @@ args: [] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] echo v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/echo[EXE]` ", ) @@ -84,7 +84,7 @@ args: [] .with_stderr( "\ [COMPILING] foo v0.0.1 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `target/debug/foo[EXE]` ", ) @@ -140,7 +140,7 @@ args: [] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] echo v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/echo[EXE]` ", ) @@ -231,7 +231,7 @@ fn main() { .with_stderr( "\ [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE]` ", ) @@ -262,7 +262,7 @@ fn main() { "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE]` ", ) @@ -291,7 +291,7 @@ fn main() { "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE]` ", ) @@ -307,7 +307,7 @@ fn main() { .with_stderr( "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE]` ", ) @@ -325,7 +325,7 @@ fn main() { "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE]` ", ) @@ -437,7 +437,7 @@ fn main() { "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE]` ", ) @@ -462,7 +462,7 @@ args: ["-NotAnArg"] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE] -NotAnArg` ", ) @@ -487,7 +487,7 @@ args: ["-NotAnArg"] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE] -NotAnArg` ", ) @@ -512,7 +512,7 @@ args: ["--help"] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE] --help` ", ) @@ -536,7 +536,7 @@ args: [] .with_stderr( r#"[WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] s-h-w-c- v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/s-h-w-c-[EXE]` "#, ) @@ -560,7 +560,7 @@ args: [] .with_stderr( r#"[WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] answer v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/answer[EXE]` "#, ) @@ -582,7 +582,7 @@ args: [] .with_stderr( r#"[WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] package v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/package[EXE]` "#, ) @@ -741,7 +741,7 @@ fn main() { [DOWNLOADED] script v1.0.0 (registry `dummy-registry`) [COMPILING] script v1.0.0 [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE] --help` ", ) @@ -778,7 +778,7 @@ fn main() { [LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE] --help` ", ) @@ -807,7 +807,7 @@ fn main() { "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE] --help` ", ) @@ -836,7 +836,7 @@ fn main() { "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE] --help` ", ) @@ -861,7 +861,7 @@ args: [] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[ROOT]/home/.cargo/target/[..]/debug/script[EXE]` ", ) @@ -889,7 +889,7 @@ args: [] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[ROOT]/home/.cargo/target/[..]/debug/script[EXE]` ", ) @@ -952,7 +952,7 @@ fn cmd_check_with_embedded() { "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [CHECKING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1013,7 +1013,7 @@ fn cmd_build_with_embedded() { "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s ", ) .run(); @@ -1041,7 +1041,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] test [unoptimized + debuginfo] target(s) in [..]s [RUNNING] unittests script.rs ([..]) ", ) @@ -1254,7 +1254,7 @@ args: [] "\ [WARNING] `package.edition` is unspecified, defaulting to `2021` [COMPILING] script v0.0.0 ([ROOT]/foo) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s [RUNNING] `[..]/debug/script[EXE]` ", ) diff --git a/tests/testsuite/source_replacement.rs b/tests/testsuite/source_replacement.rs index 7369ad93043f..839660719d77 100644 --- a/tests/testsuite/source_replacement.rs +++ b/tests/testsuite/source_replacement.rs @@ -219,7 +219,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for [DOWNLOADED] bar v1.0.0 (registry `alternative`) [COMPILING] bar v1.0.0 [COMPILING] foo v0.0.1 ([..]foo-0.0.1) -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] [PACKAGED] [..] [UPLOADING] foo v0.0.1 ([..]) [UPLOADED] foo v0.0.1 to registry `crates-io` @@ -292,7 +292,7 @@ fn source_replacement_with_registry_url() { [DOWNLOADED] bar v0.0.1 (registry `using-registry-url`) [CHECKING] bar v0.0.1 [CHECKING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] ", ) .run(); diff --git a/tests/testsuite/tool_paths.rs b/tests/testsuite/tool_paths.rs index d8cbb7f8f2d1..b693e138e753 100644 --- a/tests/testsuite/tool_paths.rs +++ b/tests/testsuite/tool_paths.rs @@ -26,7 +26,7 @@ fn pathless_tools() { "\ [COMPILING] foo v0.5.0 ([CWD]) [RUNNING] `rustc [..] -C linker=nonexistent-linker [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -52,7 +52,7 @@ fn custom_linker_cfg() { "\ [COMPILING] foo v0.5.0 ([CWD]) [RUNNING] `rustc [..] -C linker=nonexistent-linker [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -85,7 +85,7 @@ fn custom_linker_cfg_precedence() { "\ [COMPILING] foo v0.5.0 ([CWD]) [RUNNING] `rustc [..] -C linker=nonexistent-linker [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -151,7 +151,7 @@ fn absolute_tools() { "\ [COMPILING] foo v0.5.0 ([CWD]) [RUNNING] `rustc [..] -C linker=[..]bogus/nonexistent-linker [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run(); @@ -195,7 +195,7 @@ fn relative_tools() { "\ [COMPILING] bar v0.5.0 ([CWD]) [RUNNING] `rustc [..] -C linker={prefix}/./tools/nonexistent-linker [..]` -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", prefix = prefix, )) @@ -227,7 +227,7 @@ fn custom_runner() { .with_stderr_contains( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `nonexistent-runner -r target/debug/foo[EXE] --param` ", ) @@ -239,7 +239,7 @@ fn custom_runner() { "\ [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc [..]` -[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] test [unoptimized + debuginfo] target(s) in [..] [RUNNING] `nonexistent-runner -r [..]/target/debug/deps/test-[..][EXE] --param` ", ) @@ -252,7 +252,7 @@ fn custom_runner() { [COMPILING] foo v0.0.1 ([CWD]) [RUNNING] `rustc [..]` [RUNNING] `rustc [..]` -[FINISHED] `bench` profile [optimized] target(s) in [..] +[FINISHED] bench [optimized] target(s) in [..] [RUNNING] `nonexistent-runner -r [..]/target/release/deps/bench-[..][EXE] --param --bench` ", ) @@ -278,7 +278,7 @@ fn custom_runner_cfg() { .with_stderr_contains( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `nonexistent-runner -r target/debug/foo[EXE] --param` ", ) @@ -312,7 +312,7 @@ fn custom_runner_cfg_precedence() { .with_stderr_contains( "\ [COMPILING] foo v0.0.1 ([CWD]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] [RUNNING] `nonexistent-runner -r target/debug/foo[EXE] --param` ", ) @@ -362,7 +362,7 @@ fn custom_runner_env() { .with_stderr(&format!( "\ [COMPILING] foo [..] -[FINISHED] `dev` profile [..] +[FINISHED] dev [..] [RUNNING] `nonexistent-runner --foo target/debug/foo[EXE]` [ERROR] could not execute process `nonexistent-runner --foo target/debug/foo[EXE]` (never executed) diff --git a/tests/testsuite/warn_on_failure.rs b/tests/testsuite/warn_on_failure.rs index 967ffacaf133..e74e3187ef7d 100644 --- a/tests/testsuite/warn_on_failure.rs +++ b/tests/testsuite/warn_on_failure.rs @@ -71,7 +71,7 @@ fn no_warning_on_success() { [DOWNLOADED] bar v0.0.1 ([..]) [COMPILING] bar v0.0.1 [COMPILING] foo v0.0.1 ([..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ", ) .run();