Skip to content

[STABLE-1.62] Bump cargo util stable #10806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 1, 2022
Merged

[STABLE-1.62] Bump cargo util stable #10806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
524745d
Bump cargo-util version.
ehuss Jun 30, 2022
6dedcf8
Ignore invalid_target_empty test.
ehuss Jun 30, 2022
20e282b
Auto merge of #10785 - ehuss:fix-dead_code-diag, r=Eh2406
bors Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo"
version = "0.63.0"
version = "0.63.1"
edition = "2021"
license = "MIT OR Apache-2.0"
homepage = "https://crates.io"
Expand All @@ -19,7 +19,7 @@ path = "src/cargo/lib.rs"
atty = "0.2"
bytesize = "1.0"
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" }
crossbeam-utils = "0.8"
curl = { version = "0.4.41", features = ["http2"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-util"
version = "0.1.3"
version = "0.2.0"
edition = "2021"
license = "MIT OR Apache-2.0"
homepage = "https://github.com/rust-lang/cargo"
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ fn cargo_compile_with_warnings_in_the_root_package() {
.build();

p.cargo("build")
.with_stderr_contains("[..]function is never used: `dead`[..]")
.with_stderr_contains("[WARNING] [..]dead[..]")
.run();
}

Expand Down Expand Up @@ -686,7 +686,7 @@ fn cargo_compile_with_warnings_in_a_dep_package() {
.build();

p.cargo("build")
.with_stderr_contains("[..]function is never used: `dead`[..]")
.with_stderr_contains("[WARNING] [..]dead[..]")
.run();

assert!(p.bin("foo").is_file());
Expand Down
1 change: 1 addition & 0 deletions tests/testsuite/cargo_add/invalid_target_empty/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use crate::cargo_add::init_registry;
use cargo_test_support::curr_dir;

#[cargo_test]
#[ignore]
fn invalid_target_empty() {
init_registry();
let project = Project::from_template(curr_dir!().join("in"));
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ fn upstream_warnings_on_extra_verbose(cargo: fn(&Project, &str) -> Execs) {
.publish();

cargo(&p, "build -vv")
.with_stderr_contains("[..]warning: function is never used[..]")
.with_stderr_contains("[WARNING] [..]unused[..]")
.run();
}

Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/standard_lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ fn check_core() {
p.cargo("check -v")
.build_std_arg(&setup, "core")
.target_host()
.with_stderr_contains("[WARNING] [..]unused_fn[..]`")
.with_stderr_contains("[WARNING] [..]unused_fn[..]")
.run();
}

Expand Down