Skip to content

Commit

Permalink
Rollup merge of rust-lang#67854 - afnanenayet:afnan/report-external-m…
Browse files Browse the repository at this point in the history
…acro-lints, r=petrochenkov

Use `report_in_external_macro` for internal lints

Add the option to report lints in external macros for rustc internal lints to resolve rust-lang#66370
  • Loading branch information
JohnTitor committed Jan 14, 2020
2 parents 30ca215 + 9d95eaa commit fd162a4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/librustc_lint/internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ use syntax::ast::{Ident, Item, ItemKind};
declare_tool_lint! {
pub rustc::DEFAULT_HASH_TYPES,
Allow,
"forbid HashMap and HashSet and suggest the FxHash* variants"
"forbid HashMap and HashSet and suggest the FxHash* variants",
report_in_external_macro: true
}

pub struct DefaultHashTypes {
Expand Down Expand Up @@ -52,19 +53,22 @@ impl EarlyLintPass for DefaultHashTypes {
declare_tool_lint! {
pub rustc::USAGE_OF_TY_TYKIND,
Allow,
"usage of `ty::TyKind` outside of the `ty::sty` module"
"usage of `ty::TyKind` outside of the `ty::sty` module",
report_in_external_macro: true
}

declare_tool_lint! {
pub rustc::TY_PASS_BY_REFERENCE,
Allow,
"passing `Ty` or `TyCtxt` by reference"
"passing `Ty` or `TyCtxt` by reference",
report_in_external_macro: true
}

declare_tool_lint! {
pub rustc::USAGE_OF_QUALIFIED_TY,
Allow,
"using `ty::{Ty,TyCtxt}` instead of importing it"
"using `ty::{Ty,TyCtxt}` instead of importing it",
report_in_external_macro: true
}

declare_lint_pass!(TyTyKind => [
Expand Down
1 change: 1 addition & 0 deletions src/librustc_span/symbol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1049,6 +1049,7 @@ pub mod kw {
}

// This module has a very short name because it's used a lot.
#[allow(rustc::default_hash_types)]
pub mod sym {
use super::Symbol;
use std::convert::TryInto;
Expand Down

0 comments on commit fd162a4

Please sign in to comment.