Skip to content

Commit cadf98b

Browse files
authored
Rustup (#14860)
r? @ghost Quick out-of cycle sync to fix an ICE that was already reported twice changelog: none
2 parents 03ba508 + 8a28b79 commit cadf98b

21 files changed

+35
-23
lines changed

clippy_dev/src/sync.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,22 @@ use std::fmt::Write;
44

55
pub fn update_nightly() {
66
let date = Utc::now().format("%Y-%m-%d").to_string();
7-
let update = &mut update_text_region_fn(
7+
let toolchain_update = &mut update_text_region_fn(
88
"# begin autogenerated nightly\n",
99
"# end autogenerated nightly",
1010
|dst| {
1111
writeln!(dst, "channel = \"nightly-{date}\"").unwrap();
1212
},
1313
);
14+
let readme_update = &mut update_text_region_fn(
15+
"<!-- begin autogenerated nightly -->\n",
16+
"<!-- end autogenerated nightly -->",
17+
|dst| {
18+
writeln!(dst, "```\nnightly-{date}\n```").unwrap();
19+
},
20+
);
1421

1522
let mut updater = FileUpdater::default();
16-
updater.update_file("rust-toolchain.toml", update);
17-
updater.update_file("clippy_utils/README.md", update);
23+
updater.update_file("rust-toolchain.toml", toolchain_update);
24+
updater.update_file("clippy_utils/README.md", readme_update);
1825
}

clippy_lints/src/approx_const.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint_and_help;
33
use clippy_utils::msrvs::{self, Msrv};
44
use rustc_ast::ast::{FloatTy, LitFloatType, LitKind};
5-
use rustc_attr_parsing::RustcVersion;
5+
use rustc_attr_data_structures::RustcVersion;
66
use rustc_hir::{HirId, Lit};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_session::impl_lint_pass;

clippy_lints/src/arbitrary_source_item_ordering.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use clippy_config::types::{
66
};
77
use clippy_utils::diagnostics::span_lint_and_note;
88
use clippy_utils::is_cfg_test;
9-
use rustc_attr_parsing::AttributeKind;
9+
use rustc_attr_data_structures::AttributeKind;
1010
use rustc_hir::{
1111
AssocItemKind, Attribute, FieldDef, HirId, ImplItemRef, IsAuto, Item, ItemKind, Mod, QPath, TraitItemRef, TyKind,
1212
Variant, VariantData,

clippy_lints/src/attrs/repr_attributes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustc_attr_parsing::{AttributeKind, ReprAttr, find_attr};
1+
use rustc_attr_data_structures::{AttributeKind, ReprAttr, find_attr};
22
use rustc_hir::Attribute;
33
use rustc_lint::LateContext;
44
use rustc_span::Span;

clippy_lints/src/booleans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use clippy_utils::source::SpanRangeExt;
66
use clippy_utils::sugg::Sugg;
77
use clippy_utils::ty::{implements_trait, is_type_diagnostic_item};
88
use rustc_ast::ast::LitKind;
9-
use rustc_attr_parsing::RustcVersion;
9+
use rustc_attr_data_structures::RustcVersion;
1010
use rustc_errors::Applicability;
1111
use rustc_hir::intravisit::{FnKind, Visitor, walk_expr};
1212
use rustc_hir::{BinOpKind, Body, Expr, ExprKind, FnDecl, UnOp};

clippy_lints/src/default_union_representation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
2-
use rustc_attr_parsing::{AttributeKind, ReprAttr, find_attr};
2+
use rustc_attr_data_structures::{AttributeKind, ReprAttr, find_attr};
33
use rustc_hir::{HirId, Item, ItemKind};
44
use rustc_lint::{LateContext, LateLintPass};
55
use rustc_middle::ty::layout::LayoutOf;

clippy_lints/src/doc/suspicious_doc_comments.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
22
use rustc_ast::AttrStyle;
33
use rustc_ast::token::CommentKind;
4-
use rustc_attr_parsing::AttributeKind;
4+
use rustc_attr_data_structures::AttributeKind;
55
use rustc_errors::Applicability;
66
use rustc_hir::Attribute;
77
use rustc_lint::LateContext;

clippy_lints/src/doc/too_long_first_doc_paragraph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustc_attr_parsing::AttributeKind;
1+
use rustc_attr_data_structures::AttributeKind;
22
use rustc_errors::Applicability;
33
use rustc_hir::{Attribute, Item, ItemKind};
44
use rustc_lint::LateContext;

clippy_lints/src/format_args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use rustc_ast::{
1515
FormatArgPosition, FormatArgPositionKind, FormatArgsPiece, FormatArgumentKind, FormatCount, FormatOptions,
1616
FormatPlaceholder, FormatTrait,
1717
};
18-
use rustc_attr_parsing::RustcVersion;
18+
use rustc_attr_data_structures::RustcVersion;
1919
use rustc_data_structures::fx::FxHashMap;
2020
use rustc_errors::Applicability;
2121
use rustc_errors::SuggestionStyle::{CompletelyHidden, ShowCode};

clippy_lints/src/incompatible_msrv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint;
33
use clippy_utils::is_in_test;
44
use clippy_utils::msrvs::Msrv;
5-
use rustc_attr_parsing::{RustcVersion, StabilityLevel, StableSince};
5+
use rustc_attr_data_structures::{RustcVersion, StabilityLevel, StableSince};
66
use rustc_data_structures::fx::FxHashMap;
77
use rustc_hir::{Expr, ExprKind, HirId, QPath};
88
use rustc_lint::{LateContext, LateLintPass};

clippy_lints/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extern crate rustc_abi;
3535
extern crate rustc_arena;
3636
extern crate rustc_ast;
3737
extern crate rustc_ast_pretty;
38-
extern crate rustc_attr_parsing;
38+
extern crate rustc_attr_data_structures;
3939
extern crate rustc_data_structures;
4040
extern crate rustc_driver;
4141
extern crate rustc_errors;

clippy_lints/src/std_instead_of_core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint_and_then;
33
use clippy_utils::is_from_proc_macro;
44
use clippy_utils::msrvs::Msrv;
5-
use rustc_attr_parsing::{StabilityLevel, StableSince};
5+
use rustc_attr_data_structures::{StabilityLevel, StableSince};
66
use rustc_errors::Applicability;
77
use rustc_hir::def::Res;
88
use rustc_hir::def_id::DefId;

clippy_lints_internal/src/derive_deserialize_allowing_unknown.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ use rustc_hir::{
88
AttrArgs, AttrItem, AttrPath, Attribute, HirId, Impl, Item, ItemKind, Path, QPath, TraitRef, Ty, TyKind,
99
};
1010
use rustc_lint::{LateContext, LateLintPass};
11+
use rustc_lint_defs::declare_tool_lint;
1112
use rustc_middle::ty::TyCtxt;
12-
use rustc_session::{declare_lint_pass, declare_tool_lint};
13+
use rustc_session::declare_lint_pass;
1314
use rustc_span::sym;
1415

1516
declare_tool_lint! {

clippy_lints_internal/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ extern crate rustc_data_structures;
2525
extern crate rustc_errors;
2626
extern crate rustc_hir;
2727
extern crate rustc_lint;
28+
extern crate rustc_lint_defs;
2829
extern crate rustc_middle;
2930
extern crate rustc_session;
3031
extern crate rustc_span;

clippy_lints_internal/src/outer_expn_data_pass.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ use clippy_utils::{is_lint_allowed, method_calls, sym};
44
use rustc_errors::Applicability;
55
use rustc_hir as hir;
66
use rustc_lint::{LateContext, LateLintPass};
7-
use rustc_session::{declare_lint_pass, declare_tool_lint};
7+
use rustc_lint_defs::declare_tool_lint;
8+
use rustc_session::declare_lint_pass;
89

910
declare_tool_lint! {
1011
/// ### What it does

clippy_lints_internal/src/unnecessary_def_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use clippy_utils::{path_def_id, peel_ref_operators};
55
use rustc_hir::def_id::DefId;
66
use rustc_hir::{Expr, ExprKind};
77
use rustc_lint::{LateContext, LateLintPass};
8+
use rustc_lint_defs::{declare_lint_pass, declare_tool_lint};
89
use rustc_middle::mir::ConstValue;
9-
use rustc_session::{declare_lint_pass, declare_tool_lint};
1010
use rustc_span::symbol::Symbol;
1111

1212
declare_tool_lint! {

clippy_utils/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This crate is only guaranteed to build with this `nightly` toolchain:
88

99
<!-- begin autogenerated nightly -->
1010
```
11-
nightly-2025-05-14
11+
nightly-2025-05-21
1212
```
1313
<!-- end autogenerated nightly -->
1414

clippy_utils/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
extern crate indexmap;
2929
extern crate rustc_abi;
3030
extern crate rustc_ast;
31+
extern crate rustc_attr_data_structures;
3132
extern crate rustc_attr_parsing;
3233
extern crate rustc_const_eval;
3334
extern crate rustc_data_structures;
@@ -88,7 +89,7 @@ use std::sync::{Mutex, MutexGuard, OnceLock};
8889
use itertools::Itertools;
8990
use rustc_abi::Integer;
9091
use rustc_ast::ast::{self, LitKind, RangeLimits};
91-
use rustc_attr_parsing::{AttributeKind, find_attr};
92+
use rustc_attr_data_structures::{AttributeKind, find_attr};
9293
use rustc_data_structures::fx::FxHashMap;
9394
use rustc_data_structures::packed::Pu128;
9495
use rustc_data_structures::unhash::UnindexMap;

clippy_utils/src/msrvs.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use crate::sym;
22
use rustc_ast::Attribute;
33
use rustc_ast::attr::AttributeExt;
4-
use rustc_attr_parsing::{RustcVersion, parse_version};
4+
use rustc_attr_data_structures::RustcVersion;
5+
use rustc_attr_parsing::parse_version;
56
use rustc_lint::LateContext;
67
use rustc_session::Session;
78
use rustc_span::Symbol;

clippy_utils/src/qualify_min_const_fn.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
use crate::msrvs::{self, Msrv};
77
use hir::LangItem;
8-
use rustc_attr_parsing::{RustcVersion, StableSince};
8+
use rustc_attr_data_structures::{RustcVersion, StableSince};
99
use rustc_const_eval::check_consts::ConstCx;
1010
use rustc_hir as hir;
1111
use rustc_hir::def_id::DefId;
@@ -404,7 +404,7 @@ fn is_stable_const_fn(cx: &LateContext<'_>, def_id: DefId, msrv: Msrv) -> bool {
404404
.and_then(|trait_def_id| cx.tcx.lookup_const_stability(trait_def_id))
405405
})
406406
.is_none_or(|const_stab| {
407-
if let rustc_attr_parsing::StabilityLevel::Stable { since, .. } = const_stab.level {
407+
if let rustc_attr_data_structures::StabilityLevel::Stable { since, .. } = const_stab.level {
408408
// Checking MSRV is manually necessary because `rustc` has no such concept. This entire
409409
// function could be removed if `rustc` provided a MSRV-aware version of `is_stable_const_fn`.
410410
// as a part of an unimplemented MSRV check https://github.com/rust-lang/rust/issues/65262.

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[toolchain]
22
# begin autogenerated nightly
3-
channel = "nightly-2025-05-14"
3+
channel = "nightly-2025-05-21"
44
# end autogenerated nightly
55
components = ["cargo", "llvm-tools", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt"]
66
profile = "minimal"

0 commit comments

Comments
 (0)