Skip to content

Commit 88e5dd2

Browse files
committed
refactor: cleanup
1 parent fe09291 commit 88e5dd2

22 files changed

+3
-49
lines changed

compiler/rustc_lint/src/array_into_iter.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::{ArrayIntoIterDiag, ArrayIntoIterDiagSub};
42
use crate::{LateContext, LateLintPass, LintContext};
53
use rustc_hir as hir;

compiler/rustc_lint/src/builtin.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// #![deny(rustc::untranslatable_diagnostic)]
2-
// #![deny(rustc::diagnostic_outside_of_impl)]
31
//! Lints in the Rust compiler.
42
//!
53
//! This contains lints which can feasibly be implemented as their own
@@ -2956,11 +2954,6 @@ impl<'tcx> LateLintPass<'tcx> for ClashingExternDeclarations {
29562954
};
29572955

29582956
// Finally, emit the diagnostic.
2959-
let mut expected_str = DiagnosticStyledString::new();
2960-
expected_str.push(existing_decl_ty.fn_sig(tcx).to_string(), false);
2961-
let mut found_str = DiagnosticStyledString::new();
2962-
found_str.push(this_decl_ty.fn_sig(tcx).to_string(), true);
2963-
29642957
let this = this_fi.ident.name;
29652958
let orig = orig.get_name();
29662959
let previous_decl_label = get_relevant_span(orig_fi);
@@ -3119,6 +3112,7 @@ declare_lint! {
31193112
declare_lint_pass!(NamedAsmLabels => [NAMED_ASM_LABELS]);
31203113

31213114
impl<'tcx> LateLintPass<'tcx> for NamedAsmLabels {
3115+
#[allow(rustc::diagnostic_outside_of_impl)]
31223116
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx hir::Expr<'tcx>) {
31233117
if let hir::Expr {
31243118
kind: hir::ExprKind::InlineAsm(hir::InlineAsm { template_strs, .. }),

compiler/rustc_lint/src/context.rs

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
//! previous lint state is pushed onto a stack and the ast is then recursed
1414
//! upon. As the ast is traversed, this keeps track of the current lint level
1515
//! for all lint attributes.
16-
#![deny(rustc::untranslatable_diagnostic)]
17-
#![deny(rustc::diagnostic_outside_of_impl)]
1816
1917
use self::TargetLint::*;
2018

compiler/rustc_lint/src/early.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
//! Implementation of lint checking.
42
//!
53
//! The lint checking is mostly consolidated into one pass which runs

compiler/rustc_lint/src/enum_intrinsics_non_enums.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::{
42
context::LintContext,
53
lints::{EnumIntrinsicsMemDiscriminate, EnumIntrinsicsMemVariant},

compiler/rustc_lint/src/errors.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use rustc_errors::{
42
fluent, AddToDiagnostic, Diagnostic, ErrorGuaranteed, Handler, IntoDiagnostic,
53
SubdiagnosticMessage,

compiler/rustc_lint/src/expect.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::{Expectation, ExpectationNote};
42
use rustc_middle::ty::query::Providers;
53
use rustc_middle::ty::TyCtxt;

compiler/rustc_lint/src/for_loops_over_fallibles.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::{
42
lints::{
53
ForLoopsOverFalliblesDiag, ForLoopsOverFalliblesLoopSub, ForLoopsOverFalliblesQuestionMark,

compiler/rustc_lint/src/internal.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//! Some lints that are only useful in the compiler or crates that use compiler internals, such as
22
//! Clippy.
33
4-
#![deny(rustc::untranslatable_diagnostic)]
5-
#![deny(rustc::diagnostic_outside_of_impl)]
64
use crate::lints::{
75
BadOptAccessDiag, DefaultHashTypesDiag, DiagOutOfImpl, LintPassByHand, NonExistantDocKeyword,
86
QueryInstability, TyQualified, TykindDiag, TykindKind, UntranslatableDiag,

compiler/rustc_lint/src/let_underscore.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::{
42
lints::{NonBindingLet, NonBindingLetSub},
53
LateContext, LateLintPass, LintContext,

compiler/rustc_lint/src/levels.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::context::{CheckLintNameResult, LintStore};
42
use crate::late::unerased_lint_store;
53
use crate::lints::{

compiler/rustc_lint/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
#![feature(never_type)]
3939
#![feature(rustc_attrs)]
4040
#![recursion_limit = "256"]
41-
// #![deny(rustc::untranslatable_diagnostic)]
42-
// #![deny(rustc::diagnostic_outside_of_impl)]
41+
#![deny(rustc::untranslatable_diagnostic)]
42+
#![deny(rustc::diagnostic_outside_of_impl)]
4343

4444
#[macro_use]
4545
extern crate rustc_middle;

compiler/rustc_lint/src/methods.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::CStringPtr;
42
use crate::LateContext;
53
use crate::LateLintPass;

compiler/rustc_lint/src/non_ascii_idents.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::{
42
ConfusableIdentifierPair, IdentifierNonAsciiChar, IdentifierUncommonCodepoints,
53
MixedScriptConfusables,

compiler/rustc_lint/src/non_fmt_panic.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::{NonFmtPanicBraces, NonFmtPanicUnused};
42
use crate::{LateContext, LateLintPass, LintContext};
53
use rustc_ast as ast;

compiler/rustc_lint/src/nonstandard_style.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::{
42
NonCamelCaseType, NonCamelCaseTypeSub, NonSnakeCaseDiag, NonSnakeCaseDiagSub,
53
NonUpperCaseGlobal, NonUpperCaseGlobalSub,

compiler/rustc_lint/src/noop_method_call.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::context::LintContext;
42
use crate::lints::NoopMethodCallDiag;
53
use crate::LateContext;

compiler/rustc_lint/src/pass_by_value.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::PassByValueDiag;
42
use crate::{LateContext, LateLintPass, LintContext};
53
use rustc_hir as hir;

compiler/rustc_lint/src/redundant_semicolon.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::{lints::RedundantSemicolonsDiag, EarlyContext, EarlyLintPass, LintContext};
42
use rustc_ast::{Block, StmtKind};
53
use rustc_span::Span;

compiler/rustc_lint/src/traits.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::{DropGlue, DropTraitConstraintsDiag};
42
use crate::LateContext;
53
use crate::LateLintPass;

compiler/rustc_lint/src/types.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::{
42
AtomicOrderingFence, AtomicOrderingLoad, AtomicOrderingStore, ImproperCTypes,
53
InvalidAtomicOrderingDiag, OnlyCastu8ToChar, OverflowingBinHex, OverflowingBinHexSign,

compiler/rustc_lint/src/unused.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![deny(rustc::untranslatable_diagnostic)]
2-
#![deny(rustc::diagnostic_outside_of_impl)]
31
use crate::lints::{
42
PathStatementDrop, PathStatementDropSub, PathStatementNoEffect, UnusedAllocationDiag,
53
UnusedAllocationMutDiag, UnusedClosure, UnusedDef, UnusedDelim, UnusedDelimSuggestion,

0 commit comments

Comments
 (0)