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-sentance cases because I was unsure how to handle those

r? @weighanglo
This commit is contained in:
Ed Page 2024-02-06 19:52:12 -06:00
parent e3de3bfea1
commit 69eb49194b
20 changed files with 68 additions and 68 deletions

View File

@ -175,7 +175,7 @@ impl DirtyReason {
DirtyReason::LocalLengthsChanged => { DirtyReason::LocalLengthsChanged => {
s.dirty_because(unit, "the local lengths changed")?; s.dirty_because(unit, "the local lengths changed")?;
s.note( s.note(
"This could happen because of added/removed `cargo::rerun-if` instructions in the build script", "this could happen because of added/removed `cargo::rerun-if` instructions in the build script",
)?; )?;
Ok(()) Ok(())

View File

@ -537,7 +537,7 @@ Rustdoc did not scrape the following examples because they require dev-dependenc
} }
return shell.warn(format!( return shell.warn(format!(
"Target {}{} specified, but no targets matched. This is a no-op", "target {}{} specified, but no targets matched; this is a no-op",
if miss_count > 1 { "filters" } else { "filter" }, if miss_count > 1 { "filters" } else { "filter" },
filters, filters,
)); ));

View File

@ -566,7 +566,7 @@ fn check_repo_state(
} }
config.shell().verbose(|shell| { config.shell().verbose(|shell| {
shell.warn(format!( shell.warn(format!(
"No (git) Cargo.toml found at `{}` in workdir `{}`", "no (git) Cargo.toml found at `{}` in workdir `{}`",
path.display(), path.display(),
workdir.display() workdir.display()
)) ))
@ -574,7 +574,7 @@ fn check_repo_state(
} }
} else { } else {
config.shell().verbose(|shell| { config.shell().verbose(|shell| {
shell.warn(format!("No (git) VCS found for `{}`", p.root().display())) shell.warn(format!("no (git) VCS found for `{}`", p.root().display()))
})?; })?;
} }

View File

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

View File

@ -830,7 +830,7 @@ impl Config {
fn check_environment_key_case_mismatch(&self, key: &ConfigKey) { fn check_environment_key_case_mismatch(&self, key: &ConfigKey) {
if let Some(env_key) = self.env.get_normalized(key.as_env_key()) { if let Some(env_key) = self.env.get_normalized(key.as_env_key()) {
let _ = self.shell().warn(format!( let _ = self.shell().warn(format!(
"Environment variables are expected to use uppercase letters and underscores, \ "environment variables are expected to use uppercase letters and underscores, \
the variable `{}` will be ignored and have no effect", the variable `{}` will be ignored and have no effect",
env_key env_key
)); ));
@ -1522,7 +1522,7 @@ impl Config {
if !skip_warning { if !skip_warning {
if possible_with_extension.exists() { if possible_with_extension.exists() {
self.shell().warn(format!( self.shell().warn(format!(
"Both `{}` and `{}` exist. Using `{}`", "both `{}` and `{}` exist. Using `{}`",
possible.display(), possible.display(),
possible_with_extension.display(), possible_with_extension.display(),
possible.display() possible.display()
@ -1533,7 +1533,7 @@ impl Config {
possible.display(), possible.display(),
))?; ))?;
self.shell().note( self.shell().note(
format!("If you need to support cargo 1.38 or earlier, you can symlink `{filename_without_extension}` to `{filename_without_extension}.toml`"), format!("if you need to support cargo 1.38 or earlier, you can symlink `{filename_without_extension}` to `{filename_without_extension}.toml`"),
)?; )?;
} }
} }

View File

@ -329,7 +329,7 @@ fn publish_with_registry_dependency() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.0.1 [..] [UPLOADING] foo v0.0.1 [..]
[UPLOADED] foo v0.0.1 to registry `alternative` [UPLOADED] foo v0.0.1 to registry `alternative`
note: Waiting for `foo v0.0.1` to be available at registry `alternative`. [NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `alternative` [PUBLISHED] foo v0.0.1 at registry `alternative`
", ",
@ -489,7 +489,7 @@ fn publish_to_alt_registry() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.0.1 [..] [UPLOADING] foo v0.0.1 [..]
[UPLOADED] foo v0.0.1 to registry `alternative` [UPLOADED] foo v0.0.1 to registry `alternative`
note: Waiting for `foo v0.0.1` to be available at registry `alternative`. [NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `alternative` [PUBLISHED] foo v0.0.1 at registry `alternative`
", ",
@ -571,7 +571,7 @@ fn publish_with_crates_io_dep() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.0.1 [..] [UPLOADING] foo v0.0.1 [..]
[UPLOADED] foo v0.0.1 to registry `alternative` [UPLOADED] foo v0.0.1 to registry `alternative`
note: Waiting for `foo v0.0.1` to be available at registry `alternative`. [NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `alternative` [PUBLISHED] foo v0.0.1 at registry `alternative`
", ",

View File

@ -2028,7 +2028,7 @@ fn publish_artifact_dep() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.1.0 [..] [UPLOADING] foo v0.1.0 [..]
[UPLOADED] foo v0.1.0 [..] [UPLOADED] foo v0.1.0 [..]
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.1.0 [..] [PUBLISHED] foo v0.1.0 [..]
", ",

View File

@ -652,7 +652,7 @@ fn publish_allowed() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] a v0.0.1 [..] [UPLOADING] a v0.0.1 [..]
[UPLOADED] a v0.0.1 to registry `crates-io` [UPLOADED] a v0.0.1 to registry `crates-io`
note: Waiting for `a v0.0.1` to be available at registry `crates-io`. [NOTE] waiting for `a v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] a v0.0.1 at registry `crates-io` [PUBLISHED] a v0.0.1 at registry `crates-io`
", ",

View File

@ -23,8 +23,8 @@ fn warn_unmatched_target_filters() {
p.cargo("check --tests --bins --examples --benches") p.cargo("check --tests --bins --examples --benches")
.with_stderr( .with_stderr(
"\ "\
[WARNING] Target filters `bins`, `tests`, `examples`, `benches` specified, \ [WARNING] target filters `bins`, `tests`, `examples`, `benches` specified, \
but no targets matched. This is a no-op but no targets matched; this is a no-op
[FINISHED][..] [FINISHED][..]
", ",
) )

View File

@ -276,8 +276,8 @@ f1 = 1
// It should NOT have warned for the symlink. // It should NOT have warned for the symlink.
let output = read_output(config); let output = read_output(config);
let expected = "\ let expected = "\
warning: `[ROOT]/.cargo/config` is deprecated in favor of `config.toml` [WARNING] `[ROOT]/.cargo/config` is deprecated in favor of `config.toml`
note: If you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`"; [NOTE] if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`";
assert_match(expected, &output); assert_match(expected, &output);
} }
@ -332,7 +332,7 @@ f1 = 2
// But it also should have warned. // But it also should have warned.
let output = read_output(config); let output = read_output(config);
let expected = "\ let expected = "\
warning: Both `[..]/.cargo/config` and `[..]/.cargo/config.toml` exist. Using `[..]/.cargo/config` [WARNING] both `[..]/.cargo/config` and `[..]/.cargo/config.toml` exist. Using `[..]/.cargo/config`
"; ";
assert_match(expected, &output); assert_match(expected, &output);
} }

View File

@ -77,7 +77,7 @@ fn publish() {
{"v":1,"registry":{"index-url":"[..]","name":"alternative"},"kind":"get","operation":"publish","name":"foo","vers":"0.1.0","cksum":"[..]"} {"v":1,"registry":{"index-url":"[..]","name":"alternative"},"kind":"get","operation":"publish","name":"foo","vers":"0.1.0","cksum":"[..]"}
[UPLOADING] foo v0.1.0 [..] [UPLOADING] foo v0.1.0 [..]
[UPLOADED] foo v0.1.0 [..] [UPLOADED] foo v0.1.0 [..]
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.1.0 [..] [PUBLISHED] foo v0.1.0 [..]
"#, "#,
@ -541,7 +541,7 @@ fn token_caching() {
{"v":1,"registry":{"index-url":"[..]","name":"alternative"},"kind":"get","operation":"publish","name":"foo","vers":"0.1.0","cksum":"[..]"} {"v":1,"registry":{"index-url":"[..]","name":"alternative"},"kind":"get","operation":"publish","name":"foo","vers":"0.1.0","cksum":"[..]"}
[UPLOADING] foo v0.1.0 [..] [UPLOADING] foo v0.1.0 [..]
[UPLOADED] foo v0.1.0 [..] [UPLOADED] foo v0.1.0 [..]
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.1.0 [..] [PUBLISHED] foo v0.1.0 [..]
"#; "#;

View File

@ -113,7 +113,7 @@ fn publish_with_target() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.0.0 ([CWD]) [UPLOADING] foo v0.0.0 ([CWD])
[UPLOADED] foo v0.0.0 to registry `crates-io` [UPLOADED] foo v0.0.0 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.0 at registry `crates-io` [PUBLISHED] foo v0.0.0 at registry `crates-io`
", ",

View File

@ -898,7 +898,7 @@ fn publish_no_implicit() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.1.0 [..] [UPLOADING] foo v0.1.0 [..]
[UPLOADED] foo v0.1.0 [..] [UPLOADED] foo v0.1.0 [..]
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.1.0 [..] [PUBLISHED] foo v0.1.0 [..]
", ",
@ -1021,7 +1021,7 @@ fn publish() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.1.0 [..] [UPLOADING] foo v0.1.0 [..]
[UPLOADED] foo v0.1.0 [..] [UPLOADED] foo v0.1.0 [..]
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.1.0 [..] [PUBLISHED] foo v0.1.0 [..]
", ",

View File

@ -173,7 +173,7 @@ fn inherit_own_workspace_fields() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v1.2.3 [..] [UPLOADING] foo v1.2.3 [..]
[UPLOADED] foo v1.2.3 to registry `crates-io` [UPLOADED] foo v1.2.3 to registry `crates-io`
note: Waiting for `foo v1.2.3` to be available at registry `crates-io`. [NOTE] waiting for `foo v1.2.3` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v1.2.3 at registry `crates-io` [PUBLISHED] foo v1.2.3 at registry `crates-io`
", ",
@ -323,7 +323,7 @@ fn inherit_own_dependencies() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] bar v0.2.0 [..] [UPLOADING] bar v0.2.0 [..]
[UPLOADED] bar v0.2.0 to registry `crates-io` [UPLOADED] bar v0.2.0 to registry `crates-io`
note: Waiting for `bar v0.2.0` to be available at registry `crates-io`. [NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] bar v0.2.0 at registry `crates-io` [PUBLISHED] bar v0.2.0 at registry `crates-io`
", ",
@ -469,7 +469,7 @@ fn inherit_own_detailed_dependencies() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] bar v0.2.0 [..] [UPLOADING] bar v0.2.0 [..]
[UPLOADED] bar v0.2.0 to registry `crates-io` [UPLOADED] bar v0.2.0 to registry `crates-io`
note: Waiting for `bar v0.2.0` to be available at registry `crates-io`. [NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] bar v0.2.0 at registry `crates-io` [PUBLISHED] bar v0.2.0 at registry `crates-io`
", ",
@ -709,7 +709,7 @@ fn inherit_workspace_fields() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] bar v1.2.3 [..] [UPLOADING] bar v1.2.3 [..]
[UPLOADED] bar v1.2.3 to registry `crates-io` [UPLOADED] bar v1.2.3 to registry `crates-io`
note: Waiting for `bar v1.2.3` to be available at registry `crates-io`. [NOTE] waiting for `bar v1.2.3` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] bar v1.2.3 at registry `crates-io` [PUBLISHED] bar v1.2.3 at registry `crates-io`
", ",
@ -867,7 +867,7 @@ fn inherit_dependencies() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] bar v0.2.0 [..] [UPLOADING] bar v0.2.0 [..]
[UPLOADED] bar v0.2.0 to registry `crates-io` [UPLOADED] bar v0.2.0 to registry `crates-io`
note: Waiting for `bar v0.2.0` to be available at registry `crates-io`. [NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] bar v0.2.0 at registry `crates-io` [PUBLISHED] bar v0.2.0 at registry `crates-io`
", ",

View File

@ -118,7 +118,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting for `foo v0.0.1` to be available at registry `crates-io`. [NOTE] waiting for `foo v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `crates-io` [PUBLISHED] foo v0.0.1 at registry `crates-io`
", ",
@ -162,7 +162,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `dummy-registry` [UPLOADED] foo v0.0.1 to registry `dummy-registry`
note: Waiting for `foo v0.0.1` to be available at registry `dummy-registry`. [NOTE] waiting for `foo v0.0.1` to be available at registry `dummy-registry`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `dummy-registry` [PUBLISHED] foo v0.0.1 at registry `dummy-registry`
", ",
@ -205,7 +205,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `dummy-registry` [UPLOADED] foo v0.0.1 to registry `dummy-registry`
note: Waiting for `foo v0.0.1` to be available at registry `dummy-registry`. [NOTE] waiting for `foo v0.0.1` to be available at registry `dummy-registry`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `dummy-registry` [PUBLISHED] foo v0.0.1 at registry `dummy-registry`
", ",
@ -259,7 +259,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -304,7 +304,7 @@ fn simple_with_index() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `[ROOT]/registry` [UPLOADED] foo v0.0.1 to registry `[ROOT]/registry`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -505,7 +505,7 @@ fn publish_clean() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -554,7 +554,7 @@ fn publish_in_sub_repo() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -603,7 +603,7 @@ fn publish_when_ignored() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -651,7 +651,7 @@ fn ignore_when_crate_ignored() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -840,7 +840,7 @@ fn publish_allowed_registry() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `alternative` [UPLOADED] foo v0.0.1 to registry `alternative`
note: Waiting for `foo v0.0.1` to be available at registry `alternative`. [NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 at registry `alternative` [PUBLISHED] foo v0.0.1 at registry `alternative`
", ",
@ -892,7 +892,7 @@ fn publish_implicitly_to_only_allowed_registry() {
p.cargo("publish") p.cargo("publish")
.with_stderr( .with_stderr(
"\ "\
[NOTE] Found `alternative` as only allowed registry. Publishing to it automatically. [NOTE] found `alternative` as only allowed registry. Publishing to it automatically.
[UPDATING] `alternative` index [UPDATING] `alternative` index
[..] [..]
[VERIFYING] foo v0.0.1 ([CWD]) [VERIFYING] foo v0.0.1 ([CWD])
@ -901,7 +901,7 @@ fn publish_implicitly_to_only_allowed_registry() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `alternative` [UPLOADED] foo v0.0.1 to registry `alternative`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -956,7 +956,7 @@ fn publish_failed_with_index_and_only_allowed_registry() {
.with_status(101) .with_status(101)
.with_stderr( .with_stderr(
"\ "\
[NOTE] Found `alternative` as only allowed registry. Publishing to it automatically. [NOTE] found `alternative` as only allowed registry. Publishing to it automatically.
[ERROR] command-line argument --index requires --token to be specified [ERROR] command-line argument --index requires --token to be specified
", ",
) )
@ -1072,7 +1072,7 @@ The registry `alternative` is not listed in the `package.publish` value in Cargo
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -1123,7 +1123,7 @@ fn publish_with_select_features() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -1174,7 +1174,7 @@ fn publish_with_all_features() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -1279,7 +1279,7 @@ fn publish_with_patch() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -1479,7 +1479,7 @@ fn publish_git_with_version() {
[..] [..]
[UPLOADING] foo v0.1.0 ([CWD]) [UPLOADING] foo v0.1.0 ([CWD])
[UPLOADED] foo v0.1.0 to registry `crates-io` [UPLOADED] foo v0.1.0 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.1.0 [..] [PUBLISHED] foo v0.1.0 [..]
", ",
@ -1602,7 +1602,7 @@ fn publish_dev_dep_no_version() {
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] foo v0.1.0 [..] [UPLOADING] foo v0.1.0 [..]
[UPLOADED] foo v0.1.0 [..] [UPLOADED] foo v0.1.0 [..]
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.1.0 [..] [PUBLISHED] foo v0.1.0 [..]
", ",
@ -1695,14 +1695,14 @@ fn credentials_ambiguous_filename() {
.with_stderr( .with_stderr(
"\ "\
[..] [..]
[WARNING] Both `[..]/credentials` and `[..]/credentials.toml` exist. Using `[..]/credentials` [WARNING] both `[..]/credentials` and `[..]/credentials.toml` exist. Using `[..]/credentials`
[..] [..]
[..] [..]
[..] [..]
[..] [..]
[UPLOADING] foo v0.0.1 [..] [UPLOADING] foo v0.0.1 [..]
[UPLOADED] foo v0.0.1 [..] [UPLOADED] foo v0.0.1 [..]
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -2117,7 +2117,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] li v0.0.1 ([CWD]/li) [UPLOADING] li v0.0.1 ([CWD]/li)
[UPLOADED] li v0.0.1 to registry `crates-io` [UPLOADED] li v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] li v0.0.1 [..] [PUBLISHED] li v0.0.1 [..]
", ",
@ -2220,7 +2220,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] li v0.0.1 ([CWD]/li) [UPLOADING] li v0.0.1 ([CWD]/li)
[UPLOADED] li v0.0.1 to registry `crates-io` [UPLOADED] li v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] li v0.0.1 [..] [PUBLISHED] li v0.0.1 [..]
", ",
@ -2316,7 +2316,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] li v0.0.1 ([CWD]/li) [UPLOADING] li v0.0.1 ([CWD]/li)
[UPLOADED] li v0.0.1 to registry `crates-io` [UPLOADED] li v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] li v0.0.1 [..] [PUBLISHED] li v0.0.1 [..]
", ",
@ -2506,7 +2506,7 @@ fn http_api_not_noop() {
[..] [..]
[UPLOADING] foo v0.0.1 ([CWD]) [UPLOADING] foo v0.0.1 ([CWD])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
You may press ctrl-c [..] You may press ctrl-c [..]
[PUBLISHED] foo v0.0.1 [..] [PUBLISHED] foo v0.0.1 [..]
", ",
@ -2583,7 +2583,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay v0.0.1 ([CWD]) [UPLOADING] delay v0.0.1 ([CWD])
[UPLOADED] delay v0.0.1 to registry `crates-io` [UPLOADED] delay v0.0.1 to registry `crates-io`
note: Waiting for `delay v0.0.1` to be available at registry `crates-io`. [NOTE] waiting for `delay v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] delay v0.0.1 at registry `crates-io` [PUBLISHED] delay v0.0.1 at registry `crates-io`
", ",
@ -2675,7 +2675,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay_with_underscore v0.0.1 ([CWD]) [UPLOADING] delay_with_underscore v0.0.1 ([CWD])
[UPLOADED] delay_with_underscore v0.0.1 to registry `crates-io` [UPLOADED] delay_with_underscore v0.0.1 to registry `crates-io`
note: Waiting for `delay_with_underscore v0.0.1` to be available at registry `crates-io`. [NOTE] waiting for `delay_with_underscore v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] delay_with_underscore v0.0.1 at registry `crates-io` [PUBLISHED] delay_with_underscore v0.0.1 at registry `crates-io`
", ",
@ -2774,7 +2774,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay v0.0.2 ([CWD]) [UPLOADING] delay v0.0.2 ([CWD])
[UPLOADED] delay v0.0.2 to registry `crates-io` [UPLOADED] delay v0.0.2 to registry `crates-io`
note: Waiting for `delay v0.0.2` to be available at registry `crates-io`. [NOTE] waiting for `delay v0.0.2` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] delay v0.0.2 at registry `crates-io` [PUBLISHED] delay v0.0.2 at registry `crates-io`
", ",
@ -2890,10 +2890,10 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay v0.0.1 ([CWD]) [UPLOADING] delay v0.0.1 ([CWD])
[UPLOADED] delay v0.0.1 to registry `crates-io` [UPLOADED] delay v0.0.1 to registry `crates-io`
note: Waiting for `delay v0.0.1` to be available at registry `crates-io`. [NOTE] waiting for `delay v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
warning: timed out waiting for `delay v0.0.1` to be available in registry `crates-io` warning: timed out waiting for `delay v0.0.1` to be available in registry `crates-io`
note: The registry may have a backlog that is delaying making the crate available. The crate should be available soon. [NOTE] the registry may have a backlog that is delaying making the crate available. The crate should be available soon.
", ",
) )
.run(); .run();
@ -2939,7 +2939,7 @@ See [..]
[PACKAGED] [..] files, [..] ([..] compressed) [PACKAGED] [..] files, [..] ([..] compressed)
[UPLOADING] delay v0.0.2 ([CWD]) [UPLOADING] delay v0.0.2 ([CWD])
[UPLOADED] delay v0.0.2 to registry `crates-io` [UPLOADED] delay v0.0.2 to registry `crates-io`
note: Waiting for `delay v0.0.2` to be available at registry `crates-io`. [NOTE] waiting for `delay v0.0.2` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] delay v0.0.2 at registry `crates-io` [PUBLISHED] delay v0.0.2 at registry `crates-io`
", ",

View File

@ -478,7 +478,7 @@ fn token_not_logged() {
[PACKAGED] 3 files[..] [PACKAGED] 3 files[..]
[UPLOADING] foo v0.1.0[..] [UPLOADING] foo v0.1.0[..]
[UPLOADED] foo v0.1.0 to registry `crates-io` [UPLOADED] foo v0.1.0 to registry `crates-io`
note: Waiting [..] [NOTE] waiting [..]
"; ";
for line in lines.lines() { for line in lines.lines() {
match_contains(line, &log, None).unwrap(); match_contains(line, &log, None).unwrap();

View File

@ -810,7 +810,7 @@ Consider enabling some of the needed features by passing, e.g., `--features=\"b
.with_stderr( .with_stderr(
"\ "\
[INSTALLING] foo v0.0.1 ([..]) [INSTALLING] foo v0.0.1 ([..])
[WARNING] Target filter `bins` specified, but no targets matched. This is a no-op [WARNING] target filter `bins` specified, but no targets matched; this is a no-op
[FINISHED] release [optimized] target(s) in [..] [FINISHED] release [optimized] target(s) in [..]
[WARNING] none of the package's binaries are available for install using the selected features [WARNING] none of the package's binaries are available for install using the selected features
bin \"foo_1\" requires the features: `b`, `c` bin \"foo_1\" requires the features: `b`, `c`
@ -825,7 +825,7 @@ Consider enabling some of the needed features by passing, e.g., `--features=\"b
.with_stderr( .with_stderr(
"\ "\
[INSTALLING] foo v0.0.1 ([..]) [INSTALLING] foo v0.0.1 ([..])
[WARNING] Target filter `examples` specified, but no targets matched. This is a no-op [WARNING] target filter `examples` specified, but no targets matched; this is a no-op
[FINISHED] release [optimized] target(s) in [..] [FINISHED] release [optimized] target(s) in [..]
[WARNING] none of the package's binaries are available for install using the selected features [WARNING] none of the package's binaries are available for install using the selected features
bin \"foo_1\" requires the features: `b`, `c` bin \"foo_1\" requires the features: `b`, `c`
@ -840,7 +840,7 @@ Consider enabling some of the needed features by passing, e.g., `--features=\"b
.with_stderr( .with_stderr(
"\ "\
[INSTALLING] foo v0.0.1 ([..]) [INSTALLING] foo v0.0.1 ([..])
[WARNING] Target filters `bins`, `examples` specified, but no targets matched. This is a no-op [WARNING] target filters `bins`, `examples` specified, but no targets matched; this is a no-op
[FINISHED] release [optimized] target(s) in [..] [FINISHED] release [optimized] target(s) in [..]
[WARNING] none of the package's binaries are available for install using the selected features [WARNING] none of the package's binaries are available for install using the selected features
bin \"foo_1\" requires the features: `b`, `c` bin \"foo_1\" requires the features: `b`, `c`

View File

@ -221,7 +221,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.0.1 ([..]) [UPLOADING] foo v0.0.1 ([..])
[UPLOADED] foo v0.0.1 to registry `crates-io` [UPLOADED] foo v0.0.1 to registry `crates-io`
note: Waiting for `foo v0.0.1` to be available at registry `crates-io`. [NOTE] waiting for `foo v0.0.1` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.0.1 at registry `crates-io` [PUBLISHED] foo v0.0.1 at registry `crates-io`
", ",

View File

@ -441,7 +441,7 @@ fn target_in_environment_contains_lower_case() {
.arg(target) .arg(target)
.env(&env_key, "nonexistent-linker") .env(&env_key, "nonexistent-linker")
.with_stderr_contains(format!( .with_stderr_contains(format!(
"warning: Environment variables are expected to use uppercase \ "warning: environment variables are expected to use uppercase \
letters and underscores, the variable `{}` will be ignored and \ letters and underscores, the variable `{}` will be ignored and \
have no effect", have no effect",
env_key env_key

View File

@ -562,7 +562,7 @@ fn publish() {
[PACKAGED] [..] [PACKAGED] [..]
[UPLOADING] foo v0.1.0 [..] [UPLOADING] foo v0.1.0 [..]
[UPLOADED] foo v0.1.0 to registry `crates-io` [UPLOADED] foo v0.1.0 to registry `crates-io`
note: Waiting for `foo v0.1.0` to be available at registry `crates-io`. [NOTE] waiting for `foo v0.1.0` to be available at registry `crates-io`.
You may press ctrl-c to skip waiting; the crate should be available shortly. You may press ctrl-c to skip waiting; the crate should be available shortly.
[PUBLISHED] foo v0.1.0 at registry `crates-io` [PUBLISHED] foo v0.1.0 at registry `crates-io`
", ",