From: Eric Huss Date: Wed, 18 Apr 2018 14:03:17 +0000 (-0700) Subject: Minor cleanup. X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~41^2~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=62d6f0d023359b8472b52ca4bec5029ab17667cb;p=cargo.git Minor cleanup. --- diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index 34aad6e05..c8ae4839d 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -418,13 +418,13 @@ impl TomlProfile { bail!("Profile overrides cannot be nested."); } if self.panic.is_some() { - bail!("`panic` may not be specified in a build override.") + bail!("`panic` may not be specified in a profile override.") } if self.lto.is_some() { - bail!("`lto` may not be specified in a build override.") + bail!("`lto` may not be specified in a profile override.") } if self.rpath.is_some() { - bail!("`rpath` may not be specified in a build override.") + bail!("`rpath` may not be specified in a profile override.") } Ok(()) } diff --git a/tests/testsuite/profiles.rs b/tests/testsuite/profiles.rs index 8b644055a..978efd79c 100644 --- a/tests/testsuite/profiles.rs +++ b/tests/testsuite/profiles.rs @@ -343,7 +343,7 @@ fn profile_in_virtual_manifest_works() { } #[test] -fn dep_override_gated() { +fn profile_override_gated() { let p = project("foo") .file( "Cargo.toml", @@ -406,7 +406,7 @@ consider adding `cargo-features = [\"profile-overrides\"]` to the manifest } #[test] -fn dep_override_basic() { +fn profile_override_basic() { let p = project("foo") .file( "Cargo.toml",