Skip to content

Commit

Permalink
Auto merge of #10988 - hi-rustin:rustin-patch-warn, r=epage
Browse files Browse the repository at this point in the history
Warning when precise or aggressive without -p flag

### What does this PR try to resolve?

ref #10919.

Warning when precise or aggressive without -p flag. It will be a hard error in future.

### How should we test and review this PR?

- Unit test.
  • Loading branch information
bors committed Aug 17, 2022
2 parents 9809f8f + a58489d commit 9e1b457
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 0 deletions.
19 changes: 19 additions & 0 deletions src/cargo/ops/cargo_generate_lockfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,25 @@ pub fn generate_lockfile(ws: &Workspace<'_>) -> CargoResult<()> {
}

pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoResult<()> {
// Currently this is only a warning, but after a transition period this will become
// a hard error.
// See https://github.com/rust-lang/cargo/issues/10919#issuecomment-1214464756.
// We should declare the `precise` and `aggressive` arguments
// require the `package` argument in the clap.
if opts.aggressive && opts.to_update.is_empty() {
ws.config().shell().warn(
"aggressive is only supported with \"--package <SPEC>\", \
this will become a hard error in a future release.",
)?;
}

if opts.precise.is_some() && opts.to_update.is_empty() {
ws.config().shell().warn(
"precise is only supported with \"--package <SPEC>\", \
this will become a hard error in a future release.",
)?;
}

if opts.aggressive && opts.precise.is_some() {
anyhow::bail!("cannot specify both aggressive and precise simultaneously")
}
Expand Down
71 changes: 71 additions & 0 deletions tests/testsuite/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,77 @@ fn update_precise() {
.run();
}

#[cargo_test]
fn update_precise_without_package() {
Package::new("serde", "0.2.0").publish();

let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "bar"
version = "0.0.1"
authors = []
[dependencies]
serde = "0.2"
"#,
)
.file("src/lib.rs", "")
.build();

p.cargo("build").run();

Package::new("serde", "0.2.1").publish();
Package::new("serde", "0.3.0").publish();

p.cargo("update --precise 0.3.0")
.with_stderr(
"\
[WARNING] precise is only supported with \"--package <SPEC>\", this will become a hard error in a future release.
[UPDATING] `[..]` index
[UPDATING] serde v0.2.0 -> v0.2.1
",
)
.run();
}

#[cargo_test]
fn update_aggressive_without_package() {
Package::new("serde", "0.2.0").publish();

let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "bar"
version = "0.0.1"
authors = []
[dependencies]
serde = "0.2"
"#,
)
.file("src/lib.rs", "")
.build();

p.cargo("build").run();

Package::new("serde", "0.2.1").publish();

p.cargo("update --aggressive")
.with_stderr(
"\
[WARNING] aggressive is only supported with \"--package <SPEC>\", this will become a hard error in a future release.
[UPDATING] `[..]` index
[UPDATING] serde v0.2.0 -> v0.2.1
",
)
.run();
}

// cargo update should respect its arguments even without a lockfile.
// See issue "Running cargo update without a Cargo.lock ignores arguments"
// at <https://github.com/rust-lang/cargo/issues/6872>.
Expand Down

0 comments on commit 9e1b457

Please sign in to comment.