Skip to content

Commit 1f44191

Browse files
bend-nbend-n
committed
1 parent b79ab29 commit 1f44191

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+433
-418
lines changed

‎src/cargo/core/compiler/job_queue/mod.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,13 +826,30 @@ impl<'gctx> DrainState<'gctx> {
826826
// `display_error` inside `handle_error`.
827827
Some(anyhow::Error::new(AlreadyPrintedError::new(error)))
828828
} else if self.queue.is_empty() && self.pending_queue.is_empty() {
829+
<<<<<<< HEAD
830+
<<<<<<< HEAD
831+
<<<<<<< HEAD
829832
let profile_link = build_runner.bcx.gctx.shell().err_hyperlink(
830833
"https://doc.rust-lang.org/cargo/reference/profiles.html#default-profiles",
831834
);
832835
let message = format!(
833836
"{profile_link}`{profile_name}` profile [{opt_type}]{profile_link:#} target(s) in {time_elapsed}",
834837
);
835838
if !build_runner.bcx.build_config.build_plan {
839+
=======
840+
let message =
841+
format!("`{profile_name}` profile [{opt_type}] target(s) in {time_elapsed}",);
842+
=======
843+
let message = format!("{profile_name} [{opt_type}] target(s) in {time_elapsed}",);
844+
>>>>>>> parent of e7e8d8748 (fix(compiler): Clarify we're showing a profile name)
845+
=======
846+
let message = format!(
847+
"{} [{}] target(s) in {}",
848+
profile_name, opt_type, time_elapsed
849+
);
850+
>>>>>>> parent of 1906d27cf (refactor(compiler): Use inline string interpolation)
851+
if !cx.bcx.build_config.build_plan {
852+
>>>>>>> parent of 69f38a08d (fix(compiler): Link people to more info about profiles)
836853
// It doesn't really matter if this fails.
837854
let _ = build_runner.bcx.gctx.shell().status("Finished", message);
838855
future_incompat::save_and_display_report(

‎tests/build-std/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ fn basic() {
114114
// There have been multiple bugs where every build triggers and update.
115115
.with_stderr(
116116
"[COMPILING] foo v0.0.1 [..]\n\
117-
[FINISHED] `dev` profile [..]",
117+
[FINISHED] dev [..]",
118118
)
119119
.run();
120120
p.cargo("run").build_std().target_host().run();
@@ -262,7 +262,7 @@ fn remap_path_scope() {
262262
.with_status(101)
263263
.with_stderr_contains(
264264
"\
265-
[FINISHED] `release` profile [optimized + debuginfo] [..]
265+
[FINISHED] release [optimized + debuginfo] [..]
266266
[RUNNING] [..]
267267
[..]thread '[..]' panicked at [..]src/main.rs:3:[..]",
268268
)

‎tests/testsuite/alt_registry.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn depend_on_alt_registry() {
3838
[DOWNLOADED] bar v0.0.1 (registry `alternative`)
3939
[CHECKING] bar v0.0.1 (registry `alternative`)
4040
[CHECKING] foo v0.0.1 ([CWD])
41-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
41+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
4242
",
4343
)
4444
.run();
@@ -51,7 +51,7 @@ fn depend_on_alt_registry() {
5151
"\
5252
[CHECKING] bar v0.0.1 (registry `alternative`)
5353
[CHECKING] foo v0.0.1 ([CWD])
54-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
54+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
5555
",
5656
)
5757
.run();
@@ -95,7 +95,7 @@ fn depend_on_alt_registry_depends_on_same_registry_no_index() {
9595
[CHECKING] baz v0.0.1 (registry `alternative`)
9696
[CHECKING] bar v0.0.1 (registry `alternative`)
9797
[CHECKING] foo v0.0.1 ([CWD])
98-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
98+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
9999
",
100100
)
101101
.run();
@@ -139,7 +139,7 @@ fn depend_on_alt_registry_depends_on_same_registry() {
139139
[CHECKING] baz v0.0.1 (registry `alternative`)
140140
[CHECKING] bar v0.0.1 (registry `alternative`)
141141
[CHECKING] foo v0.0.1 ([CWD])
142-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
142+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
143143
",
144144
)
145145
.run();
@@ -184,7 +184,7 @@ fn depend_on_alt_registry_depends_on_crates_io() {
184184
[CHECKING] baz v0.0.1
185185
[CHECKING] bar v0.0.1 (registry `alternative`)
186186
[CHECKING] foo v0.0.1 ([CWD])
187-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
187+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
188188
",
189189
)
190190
.run();
@@ -220,7 +220,7 @@ fn registry_and_path_dep_works() {
220220
[LOCKING] 2 packages to latest compatible versions
221221
[CHECKING] bar v0.0.1 ([CWD]/bar)
222222
[CHECKING] foo v0.0.1 ([CWD])
223-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
223+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
224224
",
225225
)
226226
.run();
@@ -428,7 +428,7 @@ fn alt_registry_and_crates_io_deps() {
428428
[CHECKING] alt_reg_dep v0.1.0 (registry `alternative`)
429429
[CHECKING] crates_io_dep v0.0.1
430430
[CHECKING] foo v0.0.1 ([CWD])
431-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
431+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
432432
",
433433
)
434434
.run();
@@ -701,7 +701,7 @@ fn patch_alt_reg() {
701701
[LOCKING] 2 packages to latest compatible versions
702702
[CHECKING] bar v0.1.0 ([CWD]/bar)
703703
[CHECKING] foo v0.0.1 ([CWD])
704-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
704+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
705705
",
706706
)
707707
.run();
@@ -796,7 +796,7 @@ fn no_api() {
796796
[DOWNLOADED] bar v0.0.1 (registry `alternative`)
797797
[CHECKING] bar v0.0.1 (registry `alternative`)
798798
[CHECKING] foo v0.0.1 ([CWD])
799-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
799+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
800800
",
801801
)
802802
.run();
@@ -1359,7 +1359,7 @@ fn registries_index_relative_url() {
13591359
[DOWNLOADED] bar v0.0.1 (registry `relative`)
13601360
[CHECKING] bar v0.0.1 (registry `relative`)
13611361
[CHECKING] foo v0.0.1 ([CWD])
1362-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]s
1362+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
13631363
",
13641364
)
13651365
.run();

‎tests/testsuite/bad_config.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ fn unused_keys() {
686686
"\
687687
warning: unused manifest key: target.foo.bar
688688
[CHECKING] foo v0.1.0 ([CWD])
689-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
689+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
690690
",
691691
)
692692
.run();
@@ -711,7 +711,7 @@ warning: unused manifest key: target.foo.bar
711711
"\
712712
warning: unused manifest key: package.bulid
713713
[CHECKING] foo [..]
714-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
714+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
715715
",
716716
)
717717
.run();
@@ -739,7 +739,7 @@ warning: unused manifest key: package.bulid
739739
"\
740740
warning: unused manifest key: lib.build
741741
[CHECKING] foo [..]
742-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
742+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
743743
",
744744
)
745745
.run();
@@ -764,7 +764,7 @@ fn unused_keys_in_virtual_manifest() {
764764
"\
765765
[WARNING] [..]/foo/Cargo.toml: unused manifest key: workspace.bulid
766766
[CHECKING] bar [..]
767-
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
767+
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
768768
",
769769
)
770770
.run();

0 commit comments

Comments
 (0)