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};

0 commit comments

Comments
 (0)