Skip to content

Commit 2ccf063

Browse files
borsbors
committed
Auto merge of #83149 - Dylan-DPC:rollup-ov70c5v, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #82989 (Custom error on literal names from other languages) - #83054 (Validate rustc_layout_scalar_valid_range_{start,end} attributes) - #83098 (Find more invalid doc attributes) - #83108 (Remove unused `opt_local_def_id_to_hir_id` function) - #83110 (Fix typos in `library/core/src/ptr/mod.rs` and `library/std/src/sys_common/thread_local_dtor.rs`) - #83113 (Minor refactoring in try_index_step) - #83127 (Introduce `proc_macro_back_compat` lint, and emit for `time-macros-impl`) - #83132 (Don't encode file information for span with a dummy location) - #83141 (:arrow_up: rust-analyzer) - #83144 (Introduce `rustc_interface::interface::Config::parse_sess_created` callback) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7a7bbdb + 2816c11 commit 2ccf063

File tree

42 files changed

+687
-159
lines changed

Some content is hidden

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

42 files changed

+687
-159
lines changed

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4247,6 +4247,7 @@ name = "rustc_passes"
42474247
version = "0.0.0"
42484248
dependencies = [
42494249
"rustc_ast",
4250+
"rustc_ast_pretty",
42504251
"rustc_attr",
42514252
"rustc_data_structures",
42524253
"rustc_errors",

‎compiler/rustc_ast/src/attr/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ impl NestedMetaItem {
120120
}
121121

122122
impl Attribute {
123+
#[inline]
123124
pub fn has_name(&self, name: Symbol) -> bool {
124125
match self.kind {
125126
AttrKind::Normal(ref item, _) => item.path == name,

‎compiler/rustc_ast/src/token.rs

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ use crate::tokenstream::TokenTree;
1111
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
1212
use rustc_data_structures::sync::Lrc;
1313
use rustc_macros::HashStable_Generic;
14-
use rustc_span::hygiene::ExpnKind;
15-
use rustc_span::source_map::SourceMap;
1614
use rustc_span::symbol::{kw, sym};
1715
use rustc_span::symbol::{Ident, Symbol};
18-
use rustc_span::{self, edition::Edition, FileName, RealFileName, Span, DUMMY_SP};
16+
use rustc_span::{self, edition::Edition, Span, DUMMY_SP};
1917
use std::borrow::Cow;
2018
use std::{fmt, mem};
2119

@@ -813,52 +811,6 @@ impl Nonterminal {
813811
}
814812
false
815813
}
816-
817-
// See issue #74616 for details
818-
pub fn ident_name_compatibility_hack(
819-
&self,
820-
orig_span: Span,
821-
source_map: &SourceMap,
822-
) -> Option<(Ident, bool)> {
823-
if let NtIdent(ident, is_raw) = self {
824-
if let ExpnKind::Macro(_, macro_name) = orig_span.ctxt().outer_expn_data().kind {
825-
let filename = source_map.span_to_filename(orig_span);
826-
if let FileName::Real(RealFileName::Named(path)) = filename {
827-
let matches_prefix = |prefix, filename| {
828-
// Check for a path that ends with 'prefix*/src/<filename>'
829-
let mut iter = path.components().rev();
830-
iter.next().and_then(|p| p.as_os_str().to_str()) == Some(filename)
831-
&& iter.next().and_then(|p| p.as_os_str().to_str()) == Some("src")
832-
&& iter
833-
.next()
834-
.and_then(|p| p.as_os_str().to_str())
835-
.map_or(false, |p| p.starts_with(prefix))
836-
};
837-
838-
if (macro_name == sym::impl_macros
839-
&& matches_prefix("time-macros-impl", "lib.rs"))
840-
|| (macro_name == sym::arrays && matches_prefix("js-sys", "lib.rs"))
841-
{
842-
let snippet = source_map.span_to_snippet(orig_span);
843-
if snippet.as_deref() == Ok("$name") {
844-
return Some((*ident, *is_raw));
845-
}
846-
}
847-
848-
if macro_name == sym::tuple_from_req
849-
&& (matches_prefix("actix-web", "extract.rs")
850-
|| matches_prefix("actori-web", "extract.rs"))
851-
{
852-
let snippet = source_map.span_to_snippet(orig_span);
853-
if snippet.as_deref() == Ok("$T") {
854-
return Some((*ident, *is_raw));
855-
}
856-
}
857-
}
858-
}
859-
}
860-
None
861-
}
862814
}
863815

864816
impl PartialEq for Nonterminal {

‎compiler/rustc_driver/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ fn run_compiler(
215215
diagnostic_output,
216216
stderr: None,
217217
lint_caps: Default::default(),
218+
parse_sess_created: None,
218219
register_lints: None,
219220
override_queries: None,
220221
make_codegen_backend: make_codegen_backend.take().unwrap(),
@@ -298,6 +299,7 @@ fn run_compiler(
298299
diagnostic_output,
299300
stderr: None,
300301
lint_caps: Default::default(),
302+
parse_sess_created: None,
301303
register_lints: None,
302304
override_queries: None,
303305
make_codegen_backend: make_codegen_backend.unwrap(),

‎compiler/rustc_expand/src/proc_macro_server.rs

Lines changed: 66 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,21 @@ use crate::base::ExtCtxt;
22

33
use rustc_ast as ast;
44
use rustc_ast::token;
5+
use rustc_ast::token::Nonterminal;
6+
use rustc_ast::token::NtIdent;
57
use rustc_ast::tokenstream::{self, CanSynthesizeMissingTokens};
68
use rustc_ast::tokenstream::{DelimSpan, Spacing::*, TokenStream, TreeAndSpacing};
79
use rustc_ast_pretty::pprust;
810
use rustc_data_structures::sync::Lrc;
911
use rustc_errors::Diagnostic;
12+
use rustc_lint_defs::builtin::PROC_MACRO_BACK_COMPAT;
13+
use rustc_lint_defs::BuiltinLintDiagnostics;
1014
use rustc_parse::lexer::nfc_normalize;
1115
use rustc_parse::{nt_to_tokenstream, parse_stream_from_source_str};
1216
use rustc_session::parse::ParseSess;
17+
use rustc_span::hygiene::ExpnKind;
1318
use rustc_span::symbol::{self, kw, sym, Symbol};
14-
use rustc_span::{BytePos, FileName, MultiSpan, Pos, SourceFile, Span};
19+
use rustc_span::{BytePos, FileName, MultiSpan, Pos, RealFileName, SourceFile, Span};
1520

1621
use pm::bridge::{server, TokenTree};
1722
use pm::{Delimiter, Level, LineColumn, Spacing};
@@ -174,9 +179,7 @@ impl FromInternal<(TreeAndSpacing, &'_ ParseSess, &'_ mut Vec<Self>)>
174179
}
175180

176181
Interpolated(nt) => {
177-
if let Some((name, is_raw)) =
178-
nt.ident_name_compatibility_hack(span, sess.source_map())
179-
{
182+
if let Some((name, is_raw)) = ident_name_compatibility_hack(&nt, span, sess) {
180183
TokenTree::Ident(Ident::new(sess, name.name, is_raw, name.span))
181184
} else {
182185
let stream = nt_to_tokenstream(&nt, sess, CanSynthesizeMissingTokens::No);
@@ -711,3 +714,62 @@ impl server::Span for Rustc<'_> {
711714
self.sess.source_map().span_to_snippet(span).ok()
712715
}
713716
}
717+
718+
// See issue #74616 for details
719+
fn ident_name_compatibility_hack(
720+
nt: &Nonterminal,
721+
orig_span: Span,
722+
sess: &ParseSess,
723+
) -> Option<(rustc_span::symbol::Ident, bool)> {
724+
if let NtIdent(ident, is_raw) = nt {
725+
if let ExpnKind::Macro(_, macro_name) = orig_span.ctxt().outer_expn_data().kind {
726+
let source_map = sess.source_map();
727+
let filename = source_map.span_to_filename(orig_span);
728+
if let FileName::Real(RealFileName::Named(path)) = filename {
729+
let matches_prefix = |prefix, filename| {
730+
// Check for a path that ends with 'prefix*/src/<filename>'
731+
let mut iter = path.components().rev();
732+
iter.next().and_then(|p| p.as_os_str().to_str()) == Some(filename)
733+
&& iter.next().and_then(|p| p.as_os_str().to_str()) == Some("src")
734+
&& iter
735+
.next()
736+
.and_then(|p| p.as_os_str().to_str())
737+
.map_or(false, |p| p.starts_with(prefix))
738+
};
739+
740+
let time_macros_impl =
741+
macro_name == sym::impl_macros && matches_prefix("time-macros-impl", "lib.rs");
742+
if time_macros_impl
743+
|| (macro_name == sym::arrays && matches_prefix("js-sys", "lib.rs"))
744+
{
745+
let snippet = source_map.span_to_snippet(orig_span);
746+
if snippet.as_deref() == Ok("$name") {
747+
if time_macros_impl {
748+
sess.buffer_lint_with_diagnostic(
749+
&PROC_MACRO_BACK_COMPAT,
750+
orig_span,
751+
ast::CRATE_NODE_ID,
752+
"using an old version of `time-macros-impl`",
753+
BuiltinLintDiagnostics::ProcMacroBackCompat(
754+
"the `time-macros-impl` crate will stop compiling in futures version of Rust. \
755+
Please update to the latest version of the `time` crate to avoid breakage".to_string())
756+
);
757+
}
758+
return Some((*ident, *is_raw));
759+
}
760+
}
761+
762+
if macro_name == sym::tuple_from_req
763+
&& (matches_prefix("actix-web", "extract.rs")
764+
|| matches_prefix("actori-web", "extract.rs"))
765+
{
766+
let snippet = source_map.span_to_snippet(orig_span);
767+
if snippet.as_deref() == Ok("$T") {
768+
return Some((*ident, *is_raw));
769+
}
770+
}
771+
}
772+
}
773+
}
774+
None
775+
}

‎compiler/rustc_hir/src/definitions.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,6 @@ impl Definitions {
342342
self.def_id_to_hir_id[id].unwrap()
343343
}
344344

345-
#[inline]
346-
pub fn opt_local_def_id_to_hir_id(&self, id: LocalDefId) -> Option<hir::HirId> {
347-
self.def_id_to_hir_id[id]
348-
}
349-
350345
#[inline]
351346
pub fn opt_hir_id_to_local_def_id(&self, hir_id: hir::HirId) -> Option<LocalDefId> {
352347
self.hir_id_to_def_id.get(&hir_id).copied()

‎compiler/rustc_interface/src/interface.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ pub struct Config {
142142

143143
pub lint_caps: FxHashMap<lint::LintId, lint::Level>,
144144

145+
/// This is a callback from the driver that is called when [`ParseSess`] is created.
146+
pub parse_sess_created: Option<Box<dyn FnOnce(&mut ParseSess) + Send>>,
147+
145148
/// This is a callback from the driver that is called when we're registering lints;
146149
/// it is called during plugin registration when we have the LintStore in a non-shared state.
147150
///
@@ -166,7 +169,7 @@ pub struct Config {
166169

167170
pub fn create_compiler_and_run<R>(config: Config, f: impl FnOnce(&Compiler) -> R) -> R {
168171
let registry = &config.registry;
169-
let (sess, codegen_backend) = util::create_session(
172+
let (mut sess, codegen_backend) = util::create_session(
170173
config.opts,
171174
config.crate_cfg,
172175
config.diagnostic_output,
@@ -177,6 +180,14 @@ pub fn create_compiler_and_run<R>(config: Config, f: impl FnOnce(&Compiler) -> R
177180
registry.clone(),
178181
);
179182

183+
if let Some(parse_sess_created) = config.parse_sess_created {
184+
parse_sess_created(
185+
&mut Lrc::get_mut(&mut sess)
186+
.expect("create_session() should never share the returned session")
187+
.parse_sess,
188+
);
189+
}
190+
180191
let compiler = Compiler {
181192
sess,
182193
codegen_backend,

‎compiler/rustc_lint/src/context.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,9 @@ pub trait LintContext: Sized {
670670
json
671671
);
672672
}
673+
BuiltinLintDiagnostics::ProcMacroBackCompat(note) => {
674+
db.note(&note);
675+
}
673676
}
674677
// Rewrap `db`, and pass control to the user.
675678
decorate(LintDiagnosticBuilder::new(db));

‎compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//! compiler code, rather than using their own custom pass. Those
77
//! lints are all available in `rustc_lint::builtin`.
88
9-
use crate::{declare_lint, declare_lint_pass};
9+
use crate::{declare_lint, declare_lint_pass, FutureBreakage};
1010
use rustc_span::edition::Edition;
1111

1212
declare_lint! {
@@ -2955,6 +2955,7 @@ declare_lint_pass! {
29552955
SEMICOLON_IN_EXPRESSIONS_FROM_MACROS,
29562956
DISJOINT_CAPTURE_DROP_REORDER,
29572957
LEGACY_DERIVE_HELPERS,
2958+
PROC_MACRO_BACK_COMPAT,
29582959
]
29592960
}
29602961

@@ -3082,3 +3083,53 @@ declare_lint! {
30823083
edition: None,
30833084
};
30843085
}
3086+
3087+
declare_lint! {
3088+
/// The `proc_macro_back_compat` lint detects uses of old versions of certain
3089+
/// proc-macro crates, which have hardcoded workarounds in the compiler.
3090+
///
3091+
/// ### Example
3092+
///
3093+
/// ```rust,ignore (needs-dependency)
3094+
///
3095+
/// use time_macros_impl::impl_macros;
3096+
/// struct Foo;
3097+
/// impl_macros!(Foo);
3098+
/// ```
3099+
///
3100+
/// This will produce:
3101+
///
3102+
/// ```text
3103+
/// warning: using an old version of `time-macros-impl`
3104+
/// ::: $DIR/group-compat-hack.rs:27:5
3105+
/// |
3106+
/// LL | impl_macros!(Foo);
3107+
/// | ------------------ in this macro invocation
3108+
/// |
3109+
/// = note: `#[warn(proc_macro_back_compat)]` on by default
3110+
/// = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
3111+
/// = note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
3112+
/// = note: the `time-macros-impl` crate will stop compiling in futures version of Rust. Please update to the latest version of the `time` crate to avoid breakage
3113+
/// = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
3114+
/// ```
3115+
///
3116+
/// ### Explanation
3117+
///
3118+
/// Eventually, the backwards-compatibility hacks present in the compiler will be removed,
3119+
/// causing older versions of certain crates to stop compiling.
3120+
/// This is a [future-incompatible] lint to ease the transition to an error.
3121+
/// See [issue #83125] for more details.
3122+
///
3123+
/// [issue #83125]: https://github.com/rust-lang/rust/issues/83125
3124+
/// [future-incompatible]: ../index.md#future-incompatible-lints
3125+
pub PROC_MACRO_BACK_COMPAT,
3126+
Warn,
3127+
"detects usage of old versions of certain proc-macro crates",
3128+
@future_incompatible = FutureIncompatibleInfo {
3129+
reference: "issue #83125 <https://github.com/rust-lang/rust/issues/83125>",
3130+
edition: None,
3131+
future_breakage: Some(FutureBreakage {
3132+
date: None
3133+
})
3134+
};
3135+
}

‎compiler/rustc_lint_defs/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ pub enum BuiltinLintDiagnostics {
266266
PatternsInFnsWithoutBody(Span, Ident),
267267
LegacyDeriveHelpers(Span),
268268
ExternDepSpec(String, ExternDepSpec),
269+
ProcMacroBackCompat(String),
269270
}
270271

271272
/// Lints that are buffered up early on in the `Session` before the

‎compiler/rustc_middle/src/hir/map/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,6 @@ impl<'hir> Map<'hir> {
180180
self.tcx.definitions.local_def_id_to_hir_id(def_id)
181181
}
182182

183-
#[inline]
184-
pub fn opt_local_def_id_to_hir_id(&self, def_id: LocalDefId) -> Option<HirId> {
185-
self.tcx.definitions.opt_local_def_id_to_hir_id(def_id)
186-
}
187-
188183
pub fn iter_local_def_id(&self) -> impl Iterator<Item = LocalDefId> + '_ {
189184
self.tcx.definitions.iter_local_def_id()
190185
}

‎compiler/rustc_middle/src/ty/query/on_disk_cache.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,12 +1045,12 @@ where
10451045
E: 'a + OpaqueEncoder,
10461046
{
10471047
fn encode(&self, s: &mut CacheEncoder<'a, 'tcx, E>) -> Result<(), E::Error> {
1048-
if *self == DUMMY_SP {
1048+
let span_data = self.data();
1049+
if self.is_dummy() {
10491050
TAG_PARTIAL_SPAN.encode(s)?;
1050-
return SyntaxContext::root().encode(s);
1051+
return span_data.ctxt.encode(s);
10511052
}
10521053

1053-
let span_data = self.data();
10541054
let pos = s.source_map.byte_pos_to_line_and_col(span_data.lo);
10551055
let partial_span = match &pos {
10561056
Some((file_lo, _, _)) => !file_lo.contains(span_data.hi),

‎compiler/rustc_mir_build/src/build/expr/into.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
427427
block.unit()
428428
}
429429
ExprKind::Index { .. } | ExprKind::Deref { .. } | ExprKind::Field { .. } => {
430-
debug_assert!(Category::of(&expr.kind) == Some(Category::Place));
430+
debug_assert_eq!(Category::of(&expr.kind), Some(Category::Place));
431431

432432
// Create a "fake" temporary variable so that we check that the
433433
// value is Sized. Usually, this is caught in type checking, but
@@ -436,8 +436,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
436436
this.local_decls.push(LocalDecl::new(expr.ty, expr.span));
437437
}
438438

439-
debug_assert!(Category::of(&expr.kind) == Some(Category::Place));
440-
441439
let place = unpack!(block = this.as_place(block, expr));
442440
let rvalue = Rvalue::Use(this.consume_by_copy_or_move(place));
443441
this.cfg.push_assign(block, source_info, destination, rvalue);

‎compiler/rustc_passes/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ rustc_serialize = { path = "../rustc_serialize" }
1919
rustc_span = { path = "../rustc_span" }
2020
rustc_trait_selection = { path = "../rustc_trait_selection" }
2121
rustc_lexer = { path = "../rustc_lexer" }
22+
rustc_ast_pretty = { path = "../rustc_ast_pretty" }

0 commit comments

Comments
 (0)