Auto merge of #13561 - flip1995:rustup, r=flip1995

Rustup
r? `@ghost`
changelog: none

Author: bors

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.1.83"
+version = "0.1.84"
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"

clippy_config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy_config"
-version = "0.1.83"
+version = "0.1.84"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

clippy_lints/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy_lints"
-version = "0.1.83"
+version = "0.1.84"
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"

clippy_lints/src/attrs/allow_attributes_without_reason.rs

@@ -1,15 +1,15 @@
 usesuper::{ALLOW_ATTRIBUTES_WITHOUT_REASON,Attribute};
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::is_from_proc_macro;
-use rustc_ast::{MetaItemKind,NestedMetaItem};
+use rustc_ast::{MetaItemInner,MetaItemKind};
 use rustc_lint::{LateContext,LintContext};
 use rustc_middle::lint::in_external_macro;
 use rustc_span::sym;
 use rustc_span::symbol::Symbol;
 
-pub(super)fncheck<'cx>(cx:&LateContext<'cx>,name:Symbol,items:&[NestedMetaItem],attr:&'cxAttribute){
+pub(super)fncheck<'cx>(cx:&LateContext<'cx>,name:Symbol,items:&[MetaItemInner],attr:&'cxAttribute){
 // Check if the reason is present
-ifletSome(item) = items.last().and_then(NestedMetaItem::meta_item)
+ifletSome(item) = items.last().and_then(MetaItemInner::meta_item)
  && letMetaItemKind::NameValue(_) = &item.kind
  && item.path == sym::reason
 {

clippy_lints/src/attrs/blanket_clippy_restriction_lints.rs

@@ -1,12 +1,12 @@
 usesuper::BLANKET_CLIPPY_RESTRICTION_LINTS;
 usesuper::utils::extract_clippy_lint;
 use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_then};
-use rustc_ast::NestedMetaItem;
+use rustc_ast::MetaItemInner;
 use rustc_lint::{LateContext,Level,LintContext};
 use rustc_span::symbol::Symbol;
 use rustc_span::{DUMMY_SP, sym};
 
-pub(super)fncheck(cx:&LateContext<'_>,name:Symbol,items:&[NestedMetaItem]){
+pub(super)fncheck(cx:&LateContext<'_>,name:Symbol,items:&[MetaItemInner]){
 for lint in items {
 ifletSome(lint_name) = extract_clippy_lint(lint){
 if lint_name.as_str() == "restriction" && name != sym::allow {

clippy_lints/src/attrs/mod.rs

@@ -14,7 +14,7 @@ mod utils;
 
 use clippy_config::Conf;
 use clippy_config::msrvs::{self,Msrv};
-use rustc_ast::{Attribute,MetaItemKind,NestedMetaItem};
+use rustc_ast::{Attribute,MetaItemInner,MetaItemKind};
 use rustc_hir::{ImplItem,Item,ItemKind,TraitItem};
 use rustc_lint::{EarlyContext,EarlyLintPass,LateContext,LateLintPass};
 use rustc_session::impl_lint_pass;
@@ -456,7 +456,7 @@ impl<'tcx> LateLintPass<'tcx> for Attributes {
 return;
 }
 for item in items {
-ifletNestedMetaItem::MetaItem(mi) = &item
+ifletMetaItemInner::MetaItem(mi) = &item
  && letMetaItemKind::NameValue(lit) = &mi.kind
  && mi.has_name(sym::since)
 {

clippy_lints/src/attrs/non_minimal_cfg.rs

@@ -1,7 +1,7 @@
 usesuper::{Attribute,NON_MINIMAL_CFG};
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::source::SpanRangeExt;
-use rustc_ast::{MetaItemKind,NestedMetaItem};
+use rustc_ast::{MetaItemInner,MetaItemKind};
 use rustc_errors::Applicability;
 use rustc_lint::EarlyContext;
 use rustc_span::sym;
@@ -14,9 +14,9 @@ pub(super) fn check(cx: &EarlyContext<'_>, attr: &Attribute) {
 }
 }
 
-fncheck_nested_cfg(cx:&EarlyContext<'_>,items:&[NestedMetaItem]){
+fncheck_nested_cfg(cx:&EarlyContext<'_>,items:&[MetaItemInner]){
 for item in items {
-ifletNestedMetaItem::MetaItem(meta) = item {
+ifletMetaItemInner::MetaItem(meta) = item {
 if !meta.has_name(sym::any) && !meta.has_name(sym::all){
 continue;
 }

clippy_lints/src/attrs/useless_attribute.rs

@@ -2,7 +2,7 @@ use super::utils::{extract_clippy_lint, is_lint_level, is_word};
 usesuper::{Attribute,USELESS_ATTRIBUTE};
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::source::{SpanRangeExt, first_line_of_span};
-use rustc_ast::NestedMetaItem;
+use rustc_ast::MetaItemInner;
 use rustc_errors::Applicability;
 use rustc_hir::{Item,ItemKind};
 use rustc_lint::{LateContext,LintContext};
@@ -21,7 +21,7 @@ pub(super) fn check(cx: &LateContext<'_>, item: &Item<'_>, attrs: &[Attribute])
 for lint in lint_list {
 match item.kind{
 ItemKind::Use(..) => {
-ifletNestedMetaItem::MetaItem(meta_item) = lint
+ifletMetaItemInner::MetaItem(meta_item) = lint
  && meta_item.is_word()
  && letSome(ident) = meta_item.ident()
  && matches!(

clippy_lints/src/attrs/utils.rs

@@ -1,5 +1,5 @@
 use clippy_utils::macros::{is_panic, macro_backtrace};
-use rustc_ast::{AttrId,NestedMetaItem};
+use rustc_ast::{AttrId,MetaItemInner};
 use rustc_hir::{
 Block,Expr,ExprKind,ImplItem,ImplItemKind,Item,ItemKind,StmtKind,TraitFn,TraitItem,TraitItemKind,
 };
@@ -8,8 +8,8 @@ use rustc_middle::ty;
 use rustc_span::sym;
 use rustc_span::symbol::Symbol;
 
-pub(super)fnis_word(nmi:&NestedMetaItem,expected:Symbol) -> bool{
-ifletNestedMetaItem::MetaItem(mi) = &nmi {
+pub(super)fnis_word(nmi:&MetaItemInner,expected:Symbol) -> bool{
+ifletMetaItemInner::MetaItem(mi) = &nmi {
  mi.is_word() && mi.has_name(expected)
 }else{
 false
@@ -74,7 +74,7 @@ fn is_relevant_expr(cx: &LateContext<'_>, typeck_results: &ty::TypeckResults<'_>
 }
 
 /// Returns the lint name if it is clippy lint.
-pub(super)fnextract_clippy_lint(lint:&NestedMetaItem) -> Option<Symbol>{
+pub(super)fnextract_clippy_lint(lint:&MetaItemInner) -> Option<Symbol>{
 ifletSome(meta_item) = lint.meta_item()
  && meta_item.path.segments.len() > 1
  && let tool_name = meta_item.path.segments[0].ident

clippy_lints/src/cfg_not_test.rs

@@ -1,5 +1,5 @@
 use clippy_utils::diagnostics::span_lint_and_then;
-use rustc_ast::NestedMetaItem;
+use rustc_ast::MetaItemInner;
 use rustc_lint::{EarlyContext,EarlyLintPass};
 use rustc_session::declare_lint_pass;
 
@@ -47,7 +47,7 @@ impl EarlyLintPass for CfgNotTest {
 }
 }
 
-fncontains_not_test(list:Option<&[NestedMetaItem]>,not:bool) -> bool{
+fncontains_not_test(list:Option<&[MetaItemInner]>,not:bool) -> bool{
  list.is_some_and(|list| {
  list.iter().any(|item| {
  item.ident().is_some_and(|ident| match ident.name{