Skip to content

Commit e053eed

Browse files
committed
Remove outdated question_mark_macro_sep lint
1 parent 303f77e commit e053eed

File tree

4 files changed

+1
-17
lines changed

4 files changed

+1
-17
lines changed

src/librustc/lint/builtin.rs

-7
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,6 @@ declare_lint! {
348348

349349
/// Some lints that are buffered from `libsyntax`. See `syntax::early_buffered_lints`.
350350
pub mod parser {
351-
declare_lint! {
352-
pub QUESTION_MARK_MACRO_SEP,
353-
Allow,
354-
"detects the use of `?` as a macro separator"
355-
}
356-
357351
declare_lint! {
358352
pub ILL_FORMED_ATTRIBUTE_INPUT,
359353
Warn,
@@ -444,7 +438,6 @@ declare_lint_pass! {
444438
PROC_MACRO_DERIVE_RESOLUTION_FALLBACK,
445439
MACRO_USE_EXTERN_CRATE,
446440
MACRO_EXPANDED_MACRO_EXPORTS_ACCESSED_BY_ABSOLUTE_PATHS,
447-
parser::QUESTION_MARK_MACRO_SEP,
448441
parser::ILL_FORMED_ATTRIBUTE_INPUT,
449442
DEPRECATED_IN_FUTURE,
450443
AMBIGUOUS_ASSOCIATED_ITEMS,

src/librustc/lint/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::hir::def_id::{CrateNum, LOCAL_CRATE};
2727
use crate::hir::intravisit;
2828
use crate::hir;
2929
use crate::lint::builtin::BuiltinLintDiagnostics;
30-
use crate::lint::builtin::parser::{QUESTION_MARK_MACRO_SEP, ILL_FORMED_ATTRIBUTE_INPUT};
30+
use crate::lint::builtin::parser::ILL_FORMED_ATTRIBUTE_INPUT;
3131
use crate::session::{Session, DiagnosticMessageId};
3232
use crate::ty::TyCtxt;
3333
use crate::ty::query::Providers;
@@ -80,7 +80,6 @@ impl Lint {
8080
/// Returns the `rust::lint::Lint` for a `syntax::early_buffered_lints::BufferedEarlyLintId`.
8181
pub fn from_parser_lint_id(lint_id: BufferedEarlyLintId) -> &'static Self {
8282
match lint_id {
83-
BufferedEarlyLintId::QuestionMarkMacroSep => QUESTION_MARK_MACRO_SEP,
8483
BufferedEarlyLintId::IllFormedAttributeInput => ILL_FORMED_ATTRIBUTE_INPUT,
8584
}
8685
}

src/librustc_lint/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ use rustc::lint::builtin::{
4242
INTRA_DOC_LINK_RESOLUTION_FAILURE,
4343
MISSING_DOC_CODE_EXAMPLES,
4444
PRIVATE_DOC_TESTS,
45-
parser::QUESTION_MARK_MACRO_SEP,
4645
parser::ILL_FORMED_ATTRIBUTE_INPUT,
4746
};
4847
use rustc::session;
@@ -404,11 +403,6 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
404403
reference: "issue #50504 <https://github.com/rust-lang/rust/issues/50504>",
405404
edition: None,
406405
},
407-
FutureIncompatibleInfo {
408-
id: LintId::of(QUESTION_MARK_MACRO_SEP),
409-
reference: "issue #48075 <https://github.com/rust-lang/rust/issues/48075>",
410-
edition: Some(Edition::Edition2018),
411-
},
412406
FutureIncompatibleInfo {
413407
id: LintId::of(MACRO_EXPANDED_MACRO_EXPORTS_ACCESSED_BY_ABSOLUTE_PATHS),
414408
reference: "issue #52234 <https://github.com/rust-lang/rust/issues/52234>",

src/libsyntax/early_buffered_lints.rs

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ use syntax_pos::MultiSpan;
99
/// Since we cannot import `LintId`s from `rustc::lint`, we define some Ids here which can later be
1010
/// passed to `rustc::lint::Lint::from_parser_lint_id` to get a `rustc::lint::Lint`.
1111
pub enum BufferedEarlyLintId {
12-
/// Usage of `?` as a macro separator is deprecated.
13-
QuestionMarkMacroSep,
1412
IllFormedAttributeInput,
1513
}
1614

0 commit comments

Comments
 (0)