Skip to content

Commit 993418e

Browse files
borsbors
committed
Auto merge of #13410 - epage:note, r=weihanglo
fix: Switch more notes/warnings to lowercase See https://doc.crates.io/contrib/implementation/console.html#style By fixing existing cases, we make it more likely people will copy a case they should. I left out multi-sentence cases because I was unsure how to handle those
2 parents bb9b25f + 69eb491 commit 993418e

20 files changed

+68
-68
lines changed

‎src/cargo/core/compiler/fingerprint/dirty_reason.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl DirtyReason {
175175
DirtyReason::LocalLengthsChanged => {
176176
s.dirty_because(unit, "the local lengths changed")?;
177177
s.note(
178-
"This could happen because of added/removed `cargo::rerun-if` instructions in the build script",
178+
"this could happen because of added/removed `cargo::rerun-if` instructions in the build script",
179179
)?;
180180

181181
Ok(())

‎src/cargo/ops/cargo_compile/unit_generator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ Rustdoc did not scrape the following examples because they require dev-dependenc
537537
}
538538

539539
return shell.warn(format!(
540-
"Target {}{} specified, but no targets matched. This is a no-op",
540+
"target {}{} specified, but no targets matched; this is a no-op",
541541
if miss_count > 1 { "filters" } else { "filter" },
542542
filters,
543543
));

‎src/cargo/ops/cargo_package.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -566,15 +566,15 @@ fn check_repo_state(
566566
}
567567
config.shell().verbose(|shell| {
568568
shell.warn(format!(
569-
"No (git) Cargo.toml found at `{}` in workdir `{}`",
569+
"no (git) Cargo.toml found at `{}` in workdir `{}`",
570570
path.display(),
571571
workdir.display()
572572
))
573573
})?;
574574
}
575575
} else {
576576
config.shell().verbose(|shell| {
577-
shell.warn(format!("No (git) VCS found for `{}`", p.root().display()))
577+
shell.warn(format!("no (git) VCS found for `{}`", p.root().display()))
578578
})?;
579579
}
580580

‎src/cargo/ops/registry/publish.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
9191
// Don't change the registry for crates.io and don't warn the user.
9292
// crates.io will be defaulted even without this.
9393
opts.config.shell().note(&format!(
94-
"Found `{}` as only allowed registry. Publishing to it automatically.",
94+
"found `{}` as only allowed registry. Publishing to it automatically.",
9595
default_registry
9696
))?;
9797
publish_registry = Some(default_registry.clone());
@@ -228,7 +228,7 @@ fn wait_for_publish(
228228
format!("{short_pkg_description} to {source_description}"),
229229
)?;
230230
config.shell().note(format!(
231-
"Waiting for `{short_pkg_description}` to be available at {source_description}.\n\
231+
"waiting for `{short_pkg_description}` to be available at {source_description}.\n\
232232
You may press ctrl-c to skip waiting; the crate should be available shortly."
233233
))?;
234234
let mut progress = Progress::with_style("Waiting", ProgressStyle::Ratio, config);
@@ -265,7 +265,7 @@ fn wait_for_publish(
265265
"timed out waiting for `{short_pkg_description}` to be available in {source_description}",
266266
))?;
267267
config.shell().note(
268-
"The registry may have a backlog that is delaying making the \
268+
"the registry may have a backlog that is delaying making the \
269269
crate available. The crate should be available soon.",
270270
)?;
271271
break false;

‎src/cargo/util/config/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ impl Config {
830830
fn check_environment_key_case_mismatch(&self, key: &ConfigKey) {
831831
if let Some(env_key) = self.env.get_normalized(key.as_env_key()) {
832832
let _ = self.shell().warn(format!(
833-
"Environment variables are expected to use uppercase letters and underscores, \
833+
"environment variables are expected to use uppercase letters and underscores, \
834834
the variable `{}` will be ignored and have no effect",
835835
env_key
836836
));
@@ -1522,7 +1522,7 @@ impl Config {
15221522
if !skip_warning {
15231523
if possible_with_extension.exists() {
15241524
self.shell().warn(format!(
1525-
"Both `{}` and `{}` exist. Using `{}`",
1525+
"both `{}` and `{}` exist. Using `{}`",
15261526
possible.display(),
15271527
possible_with_extension.display(),
15281528
possible.display()
@@ -1533,7 +1533,7 @@ impl Config {
15331533
possible.display(),
15341534
))?;
15351535
self.shell().note(
1536-
format!("If you need to support cargo 1.38 or earlier, you can symlink `{filename_without_extension}` to `{filename_without_extension}.toml`"),
1536+
format!("if you need to support cargo 1.38 or earlier, you can symlink `{filename_without_extension}` to `{filename_without_extension}.toml`"),
15371537
)?;
15381538
}
15391539
}

‎tests/testsuite/alt_registry.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ fn publish_with_registry_dependency() {
329329
[PACKAGED] [..]
330330
[UPLOADING] foo v0.0.1 [..]
331331
[UPLOADED] foo v0.0.1 to registry `alternative`
332-
note: Waiting for `foo v0.0.1` to be available at registry `alternative`.
332+
[NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
333333
You may press ctrl-c to skip waiting; the crate should be available shortly.
334334
[PUBLISHED] foo v0.0.1 at registry `alternative`
335335
",
@@ -489,7 +489,7 @@ fn publish_to_alt_registry() {
489489
[PACKAGED] [..]
490490
[UPLOADING] foo v0.0.1 [..]
491491
[UPLOADED] foo v0.0.1 to registry `alternative`
492-
note: Waiting for `foo v0.0.1` to be available at registry `alternative`.
492+
[NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
493493
You may press ctrl-c to skip waiting; the crate should be available shortly.
494494
[PUBLISHED] foo v0.0.1 at registry `alternative`
495495
",
@@ -571,7 +571,7 @@ fn publish_with_crates_io_dep() {
571571
[PACKAGED] [..]
572572
[UPLOADING] foo v0.0.1 [..]
573573
[UPLOADED] foo v0.0.1 to registry `alternative`
574-
note: Waiting for `foo v0.0.1` to be available at registry `alternative`.
574+
[NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
575575
You may press ctrl-c to skip waiting; the crate should be available shortly.
576576
[PUBLISHED] foo v0.0.1 at registry `alternative`
577577
",

‎tests/testsuite/artifact_dep.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2028,7 +2028,7 @@ fn publish_artifact_dep() {
20282028
[PACKAGED] [..]
20292029
[UPLOADING] foo v0.1.0 [..]
20302030
[UPLOADED] foo v0.1.0 [..]
2031-
note: Waiting [..]
2031+
[NOTE] waiting [..]
20322032
You may press ctrl-c [..]
20332033
[PUBLISHED] foo v0.1.0 [..]
20342034
",

‎tests/testsuite/cargo_features.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ fn publish_allowed() {
652652
[PACKAGED] [..]
653653
[UPLOADING] a v0.0.1 [..]
654654
[UPLOADED] a v0.0.1 to registry `crates-io`
655-
note: Waiting for `a v0.0.1` to be available at registry `crates-io`.
655+
[NOTE] waiting for `a v0.0.1` to be available at registry `crates-io`.
656656
You may press ctrl-c to skip waiting; the crate should be available shortly.
657657
[PUBLISHED] a v0.0.1 at registry `crates-io`
658658
",

‎tests/testsuite/cargo_targets.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ fn warn_unmatched_target_filters() {
2323
p.cargo("check --tests --bins --examples --benches")
2424
.with_stderr(
2525
"\
26-
[WARNING] Target filters `bins`, `tests`, `examples`, `benches` specified, \
27-
but no targets matched. This is a no-op
26+
[WARNING] target filters `bins`, `tests`, `examples`, `benches` specified, \
27+
but no targets matched; this is a no-op
2828
[FINISHED][..]
2929
",
3030
)

‎tests/testsuite/config.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ f1 = 1
276276
// It should NOT have warned for the symlink.
277277
let output = read_output(config);
278278
let expected = "\
279-
warning: `[ROOT]/.cargo/config` is deprecated in favor of `config.toml`
280-
note: If you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`";
279+
[WARNING] `[ROOT]/.cargo/config` is deprecated in favor of `config.toml`
280+
[NOTE] if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`";
281281
assert_match(expected, &output);
282282
}
283283

@@ -332,7 +332,7 @@ f1 = 2
332332
// But it also should have warned.
333333
let output = read_output(config);
334334
let expected = "\
335-
warning: Both `[..]/.cargo/config` and `[..]/.cargo/config.toml` exist. Using `[..]/.cargo/config`
335+
[WARNING] both `[..]/.cargo/config` and `[..]/.cargo/config.toml` exist. Using `[..]/.cargo/config`
336336
";
337337
assert_match(expected, &output);
338338
}

‎tests/testsuite/credential_process.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn publish() {
7777
{"v":1,"registry":{"index-url":"[..]","name":"alternative"},"kind":"get","operation":"publish","name":"foo","vers":"0.1.0","cksum":"[..]"}
7878
[UPLOADING] foo v0.1.0 [..]
7979
[UPLOADED] foo v0.1.0 [..]
80-
note: Waiting [..]
80+
[NOTE] waiting [..]
8181
You may press ctrl-c [..]
8282
[PUBLISHED] foo v0.1.0 [..]
8383
"#,
@@ -541,7 +541,7 @@ fn token_caching() {
541541
{"v":1,"registry":{"index-url":"[..]","name":"alternative"},"kind":"get","operation":"publish","name":"foo","vers":"0.1.0","cksum":"[..]"}
542542
[UPLOADING] foo v0.1.0 [..]
543543
[UPLOADED] foo v0.1.0 [..]
544-
note: Waiting [..]
544+
[NOTE] waiting [..]
545545
You may press ctrl-c [..]
546546
[PUBLISHED] foo v0.1.0 [..]
547547
"#;

‎tests/testsuite/cross_publish.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fn publish_with_target() {
113113
[PACKAGED] [..]
114114
[UPLOADING] foo v0.0.0 ([CWD])
115115
[UPLOADED] foo v0.0.0 to registry `crates-io`
116-
note: Waiting [..]
116+
[NOTE] waiting [..]
117117
You may press ctrl-c [..]
118118
[PUBLISHED] foo v0.0.0 at registry `crates-io`
119119
",

‎tests/testsuite/features_namespaced.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ fn publish_no_implicit() {
898898
[PACKAGED] [..]
899899
[UPLOADING] foo v0.1.0 [..]
900900
[UPLOADED] foo v0.1.0 [..]
901-
note: Waiting [..]
901+
[NOTE] waiting [..]
902902
You may press ctrl-c [..]
903903
[PUBLISHED] foo v0.1.0 [..]
904904
",
@@ -1021,7 +1021,7 @@ fn publish() {
10211021
[PACKAGED] [..]
10221022
[UPLOADING] foo v0.1.0 [..]
10231023
[UPLOADED] foo v0.1.0 [..]
1024-
note: Waiting [..]
1024+
[NOTE] waiting [..]
10251025
You may press ctrl-c [..]
10261026
[PUBLISHED] foo v0.1.0 [..]
10271027
",

‎tests/testsuite/inheritable_workspace_fields.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ fn inherit_own_workspace_fields() {
173173
[PACKAGED] [..]
174174
[UPLOADING] foo v1.2.3 [..]
175175
[UPLOADED] foo v1.2.3 to registry `crates-io`
176-
note: Waiting for `foo v1.2.3` to be available at registry `crates-io`.
176+
[NOTE] waiting for `foo v1.2.3` to be available at registry `crates-io`.
177177
You may press ctrl-c to skip waiting; the crate should be available shortly.
178178
[PUBLISHED] foo v1.2.3 at registry `crates-io`
179179
",
@@ -323,7 +323,7 @@ fn inherit_own_dependencies() {
323323
[PACKAGED] [..]
324324
[UPLOADING] bar v0.2.0 [..]
325325
[UPLOADED] bar v0.2.0 to registry `crates-io`
326-
note: Waiting for `bar v0.2.0` to be available at registry `crates-io`.
326+
[NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
327327
You may press ctrl-c to skip waiting; the crate should be available shortly.
328328
[PUBLISHED] bar v0.2.0 at registry `crates-io`
329329
",
@@ -469,7 +469,7 @@ fn inherit_own_detailed_dependencies() {
469469
[PACKAGED] [..]
470470
[UPLOADING] bar v0.2.0 [..]
471471
[UPLOADED] bar v0.2.0 to registry `crates-io`
472-
note: Waiting for `bar v0.2.0` to be available at registry `crates-io`.
472+
[NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
473473
You may press ctrl-c to skip waiting; the crate should be available shortly.
474474
[PUBLISHED] bar v0.2.0 at registry `crates-io`
475475
",
@@ -709,7 +709,7 @@ fn inherit_workspace_fields() {
709709
[PACKAGED] [..]
710710
[UPLOADING] bar v1.2.3 [..]
711711
[UPLOADED] bar v1.2.3 to registry `crates-io`
712-
note: Waiting for `bar v1.2.3` to be available at registry `crates-io`.
712+
[NOTE] waiting for `bar v1.2.3` to be available at registry `crates-io`.
713713
You may press ctrl-c to skip waiting; the crate should be available shortly.
714714
[PUBLISHED] bar v1.2.3 at registry `crates-io`
715715
",
@@ -867,7 +867,7 @@ fn inherit_dependencies() {
867867
[PACKAGED] [..]
868868
[UPLOADING] bar v0.2.0 [..]
869869
[UPLOADED] bar v0.2.0 to registry `crates-io`
870-
note: Waiting for `bar v0.2.0` to be available at registry `crates-io`.
870+
[NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
871871
You may press ctrl-c to skip waiting; the crate should be available shortly.
872872
[PUBLISHED] bar v0.2.0 at registry `crates-io`
873873
",

0 commit comments

Comments
 (0)