Skip to content

Commit

Permalink
Rollup merge of #98507 - xFrednet:rfc-2383-manual-expectation-magic, …
Browse files Browse the repository at this point in the history
…r=wesleywiser

Finishing touches for `#[expect]` (RFC 2383)

This PR adds documentation and some functionality to rustc's lint passes, to manually fulfill expectations. This is needed for some lints in Clippy. Hopefully, it should be one of the last things before we can move forward with stabilizing this feature.

As part of this PR, I've also updated `clippy::duplicate_mod` to showcase how this new functionality can be used and to ensure that it works correctly.

---

changelog: [`duplicate_mod`]: Fixed lint attribute interaction

r? `@wesleywiser`

cc: rust-lang/rust#97660, rust-lang/rust#85549

And I guess that's it. Here have a magical unicorn 🦄
  • Loading branch information
Dylan-DPC authored Jul 7, 2022
2 parents 5483a7d + 0d443d1 commit 4f9933a
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 6 deletions.
22 changes: 20 additions & 2 deletions clippy_lints/src/duplicate_mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use clippy_utils::diagnostics::span_lint_and_help;
use rustc_ast::ast::{Crate, Inline, Item, ItemKind, ModKind};
use rustc_errors::MultiSpan;
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext, Level};
use rustc_session::{declare_tool_lint, impl_lint_pass};
use rustc_span::{FileName, Span};
use std::collections::BTreeMap;
Expand Down Expand Up @@ -49,6 +49,7 @@ declare_clippy_lint! {
struct Modules {
local_path: PathBuf,
spans: Vec<Span>,
lint_levels: Vec<Level>,
}

#[derive(Default)]
Expand All @@ -70,13 +71,30 @@ impl EarlyLintPass for DuplicateMod {
let modules = self.modules.entry(absolute_path).or_insert(Modules {
local_path,
spans: Vec::new(),
lint_levels: Vec::new(),
});
modules.spans.push(item.span_with_attributes());
modules.lint_levels.push(cx.get_lint_level(DUPLICATE_MOD));
}
}

fn check_crate_post(&mut self, cx: &EarlyContext<'_>, _: &Crate) {
for Modules { local_path, spans } in self.modules.values() {
for Modules { local_path, spans, lint_levels } in self.modules.values() {
if spans.len() < 2 {
continue;
}

// At this point the lint would be emitted
assert_eq!(spans.len(), lint_levels.len());
let spans: Vec<_> = spans.into_iter().zip(lint_levels).filter_map(|(span, lvl)|{
if let Some(id) = lvl.get_expectation_id() {
cx.fulfill_expectation(id);
}

(!matches!(lvl, Level::Allow | Level::Expect(_))).then_some(*span)
})
.collect();

if spans.len() < 2 {
continue;
}
Expand Down
Empty file.
13 changes: 13 additions & 0 deletions tests/ui-cargo/duplicate_mod/fail/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#[feature(lint_reasons)]

mod a;

mod b;
Expand All @@ -13,4 +15,15 @@ mod c3;
mod from_other_module;
mod other_module;

mod d;
#[path = "d.rs"]
mod d2;
#[path = "d.rs"]
#[expect(clippy::duplicate_mod)]
mod d3;
#[path = "d.rs"]
#[allow(clippy::duplicate_mod)]
mod d4;


fn main() {}
19 changes: 15 additions & 4 deletions tests/ui-cargo/duplicate_mod/fail/src/main.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: file is loaded as a module multiple times: `$DIR/b.rs`
--> $DIR/main.rs:3:1
--> $DIR/main.rs:5:1
|
LL | mod b;
| ^^^^^^ first loaded here
Expand All @@ -11,7 +11,7 @@ LL | | mod b2;
= help: replace all but one `mod` item with `use` items

error: file is loaded as a module multiple times: `$DIR/c.rs`
--> $DIR/main.rs:7:1
--> $DIR/main.rs:9:1
|
LL | mod c;
| ^^^^^^ first loaded here
Expand All @@ -25,7 +25,7 @@ LL | | mod c3;
= help: replace all but one `mod` item with `use` items

error: file is loaded as a module multiple times: `$DIR/from_other_module.rs`
--> $DIR/main.rs:13:1
--> $DIR/main.rs:15:1
|
LL | mod from_other_module;
| ^^^^^^^^^^^^^^^^^^^^^^ first loaded here
Expand All @@ -38,5 +38,16 @@ LL | | mod m;
|
= help: replace all but one `mod` item with `use` items

error: aborting due to 3 previous errors
error: file is loaded as a module multiple times: `$DIR/b.rs`
--> $DIR/main.rs:18:1
|
LL | mod d;
| ^^^^^^ first loaded here
LL | / #[path = "d.rs"]
LL | | mod d2;
| |_______^ loaded again here
|
= help: replace all but one `mod` item with `use` items

error: aborting due to 4 previous errors

0 comments on commit 4f9933a

Please sign in to comment.