diff options
| author | Jason Newcomb <jsnewcomb@pm.me> | 2024-08-24 16:31:01 -0400 |
|---|---|---|
| committer | Jason Newcomb <jsnewcomb@pm.me> | 2024-08-24 16:31:01 -0400 |
| commit | e348fe223333a52f9bb12b40e80361e726a62747 (patch) | |
| tree | 2a0c27037d65b6d38082c0448bfde10335fef7fa /clippy_dev | |
| parent | 43e1145c80d1c2f4e159885d382659ace3a1bc5d (diff) | |
| parent | 30e0b69908332ea5556511b42f66e50e9fd3fbc8 (diff) | |
| download | rust-e348fe223333a52f9bb12b40e80361e726a62747.tar.gz rust-e348fe223333a52f9bb12b40e80361e726a62747.zip | |
Merge branch 'master' into rustup
Diffstat (limited to 'clippy_dev')
| -rw-r--r-- | clippy_dev/src/main.rs | 1 | ||||
| -rw-r--r-- | clippy_dev/src/new_lint.rs | 4 | ||||
| -rw-r--r-- | clippy_dev/src/update_lints.rs | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/clippy_dev/src/main.rs b/clippy_dev/src/main.rs index 755b04b0b23..fc15913354c 100644 --- a/clippy_dev/src/main.rs +++ b/clippy_dev/src/main.rs @@ -1,3 +1,4 @@ +#![feature(rustc_private)] // warn on lints, that are included in `rust-lang/rust`s bootstrap #![warn(rust_2018_idioms, unused_lifetimes)] diff --git a/clippy_dev/src/new_lint.rs b/clippy_dev/src/new_lint.rs index 87117832fb9..de91233d196 100644 --- a/clippy_dev/src/new_lint.rs +++ b/clippy_dev/src/new_lint.rs @@ -470,7 +470,7 @@ fn setup_mod_file(path: &Path, lint: &LintData<'_>) -> io::Result<&'static str> }); // Find both the last lint declaration (declare_clippy_lint!) and the lint pass impl - while let Some(LintDeclSearchResult { content, .. }) = iter.find(|result| result.token == TokenKind::Ident) { + while let Some(LintDeclSearchResult { content, .. }) = iter.find(|result| result.token_kind == TokenKind::Ident) { let mut iter = iter .by_ref() .filter(|t| !matches!(t.token_kind, TokenKind::Whitespace | TokenKind::LineComment { .. })); @@ -480,7 +480,7 @@ fn setup_mod_file(path: &Path, lint: &LintData<'_>) -> io::Result<&'static str> // matches `!{` match_tokens!(iter, Bang OpenBrace); if let Some(LintDeclSearchResult { range, .. }) = - iter.find(|result| result.token == TokenKind::CloseBrace) + iter.find(|result| result.token_kind == TokenKind::CloseBrace) { last_decl_curly_offset = Some(range.end); } diff --git a/clippy_dev/src/update_lints.rs b/clippy_dev/src/update_lints.rs index 15578d69c3a..8dbda1c634c 100644 --- a/clippy_dev/src/update_lints.rs +++ b/clippy_dev/src/update_lints.rs @@ -604,7 +604,7 @@ fn gen_declared_lints<'a>( details.sort_unstable(); let mut output = GENERATED_FILE_COMMENT.to_string(); - output.push_str("pub(crate) static LINTS: &[&crate::LintInfo] = &[\n"); + output.push_str("pub static LINTS: &[&crate::LintInfo] = &[\n"); for (is_public, module_name, lint_name) in details { if !is_public { |