mirror of https://github.com/rust-lang/cargo
Auto merge of #10806 - ehuss:bump-cargo-util-stable-1.62, r=joshtriplett
[STABLE-1.62] Bump cargo util stable This is a stable backport of #10804. This uses version 0.2.0 compared to 0.2.1 on beta since beta has had some minor (compatible) changes. cc #10803
This commit is contained in:
commit
d39343d381
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "cargo"
|
name = "cargo"
|
||||||
version = "0.63.0"
|
version = "0.63.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
homepage = "https://crates.io"
|
homepage = "https://crates.io"
|
||||||
|
@ -19,7 +19,7 @@ path = "src/cargo/lib.rs"
|
||||||
atty = "0.2"
|
atty = "0.2"
|
||||||
bytesize = "1.0"
|
bytesize = "1.0"
|
||||||
cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
|
cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
|
||||||
cargo-util = { path = "crates/cargo-util", version = "0.1.3" }
|
cargo-util = { path = "crates/cargo-util", version = "0.2.0" }
|
||||||
crates-io = { path = "crates/crates-io", version = "0.34.0" }
|
crates-io = { path = "crates/crates-io", version = "0.34.0" }
|
||||||
crossbeam-utils = "0.8"
|
crossbeam-utils = "0.8"
|
||||||
curl = { version = "0.4.41", features = ["http2"] }
|
curl = { version = "0.4.41", features = ["http2"] }
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "cargo-util"
|
name = "cargo-util"
|
||||||
version = "0.1.3"
|
version = "0.2.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
homepage = "https://github.com/rust-lang/cargo"
|
homepage = "https://github.com/rust-lang/cargo"
|
||||||
|
|
|
@ -647,7 +647,7 @@ fn cargo_compile_with_warnings_in_the_root_package() {
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
p.cargo("build")
|
p.cargo("build")
|
||||||
.with_stderr_contains("[..]function is never used: `dead`[..]")
|
.with_stderr_contains("[WARNING] [..]dead[..]")
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -686,7 +686,7 @@ fn cargo_compile_with_warnings_in_a_dep_package() {
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
p.cargo("build")
|
p.cargo("build")
|
||||||
.with_stderr_contains("[..]function is never used: `dead`[..]")
|
.with_stderr_contains("[WARNING] [..]dead[..]")
|
||||||
.run();
|
.run();
|
||||||
|
|
||||||
assert!(p.bin("foo").is_file());
|
assert!(p.bin("foo").is_file());
|
||||||
|
|
|
@ -6,6 +6,7 @@ use crate::cargo_add::init_registry;
|
||||||
use cargo_test_support::curr_dir;
|
use cargo_test_support::curr_dir;
|
||||||
|
|
||||||
#[cargo_test]
|
#[cargo_test]
|
||||||
|
#[ignore]
|
||||||
fn invalid_target_empty() {
|
fn invalid_target_empty() {
|
||||||
init_registry();
|
init_registry();
|
||||||
let project = Project::from_template(curr_dir!().join("in"));
|
let project = Project::from_template(curr_dir!().join("in"));
|
||||||
|
|
|
@ -1961,7 +1961,7 @@ fn upstream_warnings_on_extra_verbose(cargo: fn(&Project, &str) -> Execs) {
|
||||||
.publish();
|
.publish();
|
||||||
|
|
||||||
cargo(&p, "build -vv")
|
cargo(&p, "build -vv")
|
||||||
.with_stderr_contains("[..]warning: function is never used[..]")
|
.with_stderr_contains("[WARNING] [..]unused[..]")
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -316,7 +316,7 @@ fn check_core() {
|
||||||
p.cargo("check -v")
|
p.cargo("check -v")
|
||||||
.build_std_arg(&setup, "core")
|
.build_std_arg(&setup, "core")
|
||||||
.target_host()
|
.target_host()
|
||||||
.with_stderr_contains("[WARNING] [..]unused_fn[..]`")
|
.with_stderr_contains("[WARNING] [..]unused_fn[..]")
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue