Skip to content

Commit c5e344f

Browse files
committedJul 7, 2021
Auto merge of #86920 - JohnTitor:rollup-buvzpkr, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #80918 (Add Integer::log variants) - #86717 (Rename some Rust 2021 lints to better names ) - #86819 (Clean up rustdoc IDs) - #86880 (Test ManuallyDrop::clone_from.) - #86906 (Replace deprecated compare_and_swap and fix typo in core::sync::atomic::{fence, compiler_fence} docs) - #86907 (Migrate `cpu-usage-over-time.py` to Python 3) - #86916 (rewrote documentation for thread::yield_now()) - #86919 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents c0bd5a5 + 5196885 commit c5e344f

File tree

88 files changed

+842
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+842
-299
lines changed
 

‎compiler/rustc_expand/src/mbe/macro_rules.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ use rustc_data_structures::fx::FxHashMap;
1818
use rustc_data_structures::sync::Lrc;
1919
use rustc_errors::{Applicability, DiagnosticBuilder};
2020
use rustc_feature::Features;
21-
use rustc_lint_defs::builtin::{OR_PATTERNS_BACK_COMPAT, SEMICOLON_IN_EXPRESSIONS_FROM_MACROS};
21+
use rustc_lint_defs::builtin::{
22+
RUST_2021_INCOMPATIBLE_OR_PATTERNS, SEMICOLON_IN_EXPRESSIONS_FROM_MACROS,
23+
};
2224
use rustc_lint_defs::BuiltinLintDiagnostics;
2325
use rustc_parse::parser::Parser;
2426
use rustc_session::parse::ParseSess;
@@ -975,7 +977,7 @@ fn check_matcher_core(
975977
Some(NonterminalKind::PatParam { inferred: false }),
976978
));
977979
sess.buffer_lint_with_diagnostic(
978-
&OR_PATTERNS_BACK_COMPAT,
980+
&RUST_2021_INCOMPATIBLE_OR_PATTERNS,
979981
span,
980982
ast::CRATE_NODE_ID,
981983
"the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro",

‎compiler/rustc_lint/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,9 @@ fn register_builtins(store: &mut LintStore, no_interleave_lints: bool) {
325325
store.register_renamed("redundant_semicolon", "redundant_semicolons");
326326
store.register_renamed("overlapping_patterns", "overlapping_range_endpoints");
327327
store.register_renamed("safe_packed_borrows", "unaligned_references");
328+
store.register_renamed("disjoint_capture_migration", "rust_2021_incompatible_closure_captures");
329+
store.register_renamed("or_patterns_back_compat", "rust_2021_incompatible_or_patterns");
330+
store.register_renamed("non_fmt_panic", "non_fmt_panics");
328331

329332
// These were moved to tool lints, but rustc still sees them when compiling normally, before
330333
// tool lints are registered, so `check_tool_name_for_backwards_compat` doesn't work. Use

0 commit comments

Comments
 (0)
Please sign in to comment.