Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 19 additions & 4 deletions src/cargo/lints/rules/implicit_minimum_version_req.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ pub fn lint_package(
let contents = manifest.contents();
let target_key_for_platform = target_key_for_platform(&manifest);

let mut emit_source = true;
for dep in manifest.dependencies().iter() {
let version_req = dep.version_req();
let Some(suggested_req) = get_suggested_version_req(&version_req) else {
Expand All @@ -148,10 +149,15 @@ pub fn lint_package(
key_path,
&manifest_path,
&suggested_req,
emit_source,
) else {
continue;
};

if emit_source {
emit_source = false;
}

if lint_level.is_error() {
*error_count += 1;
}
Expand Down Expand Up @@ -198,6 +204,7 @@ pub fn lint_workspace(
(name, req)
});

let mut emit_source = true;
for (name_in_toml, version_req) in dep_iter {
let Some(suggested_req) = get_suggested_version_req(&version_req) else {
continue;
Expand All @@ -213,10 +220,15 @@ pub fn lint_workspace(
&key_path,
&manifest_path,
&suggested_req,
emit_source,
) else {
continue;
};

if emit_source {
emit_source = false;
}

if lint_level.is_error() {
*error_count += 1;
}
Expand Down Expand Up @@ -256,6 +268,7 @@ fn report<'a>(
key_path: &[&str],
manifest_path: &str,
suggested_req: &str,
emit_source: bool,
) -> Option<[Group<'a>; 2]> {
let level = lint_level.to_diagnostic_level();
let emitted_source = LINT.emitted_source(lint_level, reason);
Expand All @@ -277,12 +290,14 @@ fn report<'a>(
.path(manifest_path.to_owned())
.annotation(AnnotationKind::Primary.span(span.clone()).label(label)),
);
help = help
.element(Snippet::source(contents).patch(Patch::new(span.clone(), replacement)))
.element(Level::NOTE.message(emitted_source));

help = help.element(Snippet::source(contents).patch(Patch::new(span.clone(), replacement)));
} else {
desc = desc.element(Origin::path(manifest_path.to_owned()));
help = help.element(Level::NOTE.message(emitted_source));
}

if emit_source {
desc = desc.element(Level::NOTE.message(emitted_source));
}

Some([desc, help])
Expand Down
53 changes: 20 additions & 33 deletions tests/testsuite/lints/implicit_minimum_version_req.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ implicit_minimum_version_req = "warn"
7 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -87,11 +87,11 @@ implicit_minimum_version_req = "warn"
7 | dep = "1.0"
| ^^^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -172,11 +172,11 @@ implicit_minimum_version_req = "warn"
7 | dep = { version = "1" }
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = { version = "1.0.0" }
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -220,11 +220,11 @@ implicit_minimum_version_req = "warn"
7 | dep = ">=1.0"
| ^^^^^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = ">=1.0.0"
| ++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -453,11 +453,11 @@ implicit_minimum_version_req = "warn"
7 | dep = ">=1.0, <2.0"
| ^^^^^^^^^^^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = ">=1.0.0, <2.0"
| ++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -626,11 +626,11 @@ edition = "2021"
7 | bar = { path = "bar", version = "0.1" }
| ^^^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | bar = { path = "bar", version = "0.1.0" }
| ++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[LOCKING] 1 package to latest compatible version
[CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
[CHECKING] foo v0.0.0 ([ROOT]/foo)
Expand Down Expand Up @@ -720,11 +720,11 @@ implicit_minimum_version_req = "warn"
7 | bar = { git = '[ROOTURL]/bar', version = "0.1" }
| [..]^^^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | bar = { git = '[ROOTURL]/bar', version = "0.1.0" }
| [..]++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] git repository `[ROOTURL]/bar`
[LOCKING] 1 package to latest compatible version
[CHECKING] bar v0.1.0 ([ROOTURL]/bar#[..])
Expand Down Expand Up @@ -766,11 +766,11 @@ implicit_minimum_version_req = "warn"
7 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[CHECKING] foo v0.0.0 ([ROOT]/foo)
Expand Down Expand Up @@ -812,11 +812,11 @@ implicit_minimum_version_req = "warn"
7 | dep = "1.0"
| ^^^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -861,11 +861,11 @@ implicit_minimum_version_req = "warn"
8 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
8 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -910,11 +910,11 @@ implicit_minimum_version_req = "warn"
8 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
8 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[CHECKING] foo v0.0.0 ([ROOT]/foo)
Expand Down Expand Up @@ -948,21 +948,20 @@ implicit_minimum_version_req = "warn"
.file("src/lib.rs", "")
.build();

p.cargo("check -Zcargo-lints")
p.cargo("check -Zcargo-lints --quiet")
.masquerade_as_nightly_cargo(&["cargo-lints"])
.with_stderr_data(
str![[r#"
.with_stderr_data(str![[r#"
[WARNING] dependency version requirement without an explicit minimum version
--> Cargo.toml:7:7
|
7 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[WARNING] dependency version requirement without an explicit minimum version
--> Cargo.toml:8:9
|
Expand All @@ -973,20 +972,8 @@ implicit_minimum_version_req = "warn"
|
8 | regex = "1.0.0"
| ++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[DOWNLOADING] crates ...
[DOWNLOADED] regex v1.0.0 (registry `dummy-registry`)
[DOWNLOADED] dep v1.0.0 (registry `dummy-registry`)
[CHECKING] dep v1.0.0
[CHECKING] regex v1.0.0
[CHECKING] foo v0.0.0 ([ROOT]/foo)
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s

"#]]
.unordered(),
)
"#]])
.run();
}

Expand Down Expand Up @@ -1035,11 +1022,11 @@ workspace = true
7 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -1092,11 +1079,11 @@ edition = "2021"
7 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[CHECKING] member v0.0.0 ([ROOT]/foo/member)
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s

Expand Down Expand Up @@ -1150,22 +1137,22 @@ workspace = true
7 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[WARNING] dependency version requirement without an explicit minimum version
--> member/Cargo.toml:7:7
|
7 | dep = "1.0"
| ^^^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `warn` in `[lints]`
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -1210,11 +1197,11 @@ implicit_minimum_version_req = "deny"
7 | dep = "1"
| ^^^ missing full version components
|
= [NOTE] `cargo::implicit_minimum_version_req` is set to `deny` in `[lints]`
[HELP] consider specifying full `major.minor.patch` version components
|
7 | dep = "1.0.0"
| ++++
= [NOTE] `cargo::implicit_minimum_version_req` is set to `deny` in `[lints]`
[ERROR] encountered 1 error while running lints

"#]])
Expand Down