From 64914d9d39aaa06f3796b412e90065d26a704eea Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 20 Jan 2015 11:20:22 -0800 Subject: [PATCH] rustc: Remove deprecated lint names These were all renamed quite some time ago, so remove their old names from the compiler. --- src/librustc/lint/context.rs | 25 +------------------- src/test/compile-fail/lint-renaming.rs | 16 ------------- src/test/compile-fail/lint-type-limits.rs | 2 +- src/test/compile-fail/warn-path-statement.rs | 2 +- src/test/run-pass/crate-name-attr-used.rs | 2 +- src/test/run-pass/warn-ctypes-inhibit.rs | 4 ++-- 6 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 src/test/compile-fail/lint-renaming.rs diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index de4efe09f27..fcb3200089b 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -231,30 +231,7 @@ impl LintStore { // We have one lint pass defined in this module. self.register_pass(sess, false, box GatherNodeLevels as LintPassObject); - // Insert temporary renamings for a one-time deprecation (#16545) - self.register_renamed("unnecessary_typecast", "unused_typecasts"); - self.register_renamed("unsigned_negate", "unsigned_negation"); - self.register_renamed("type_limits", "unused_comparisons"); - self.register_renamed("type_overflow", "overflowing_literals"); - self.register_renamed("ctypes", "improper_ctypes"); - self.register_renamed("owned_heap_memory", "box_pointers"); - self.register_renamed("unused_attribute", "unused_attributes"); - self.register_renamed("path_statement", "path_statements"); - self.register_renamed("unused_result", "unused_results"); - self.register_renamed("non_uppercase_statics", "non_upper_case_globals"); - self.register_renamed("unnecessary_parens", "unused_parens"); - self.register_renamed("unnecessary_import_braces", "unused_import_braces"); - self.register_renamed("unsafe_block", "unsafe_blocks"); - self.register_renamed("unnecessary_allocation", "unused_allocation"); - self.register_renamed("missing_doc", "missing_docs"); - self.register_renamed("unused_extern_crate", "unused_extern_crates"); - self.register_renamed("unnecessary_qualification", "unused_qualifications"); - self.register_renamed("unrecognized_lint", "unknown_lints"); - self.register_renamed("unused_variable", "unused_variables"); - self.register_renamed("dead_assignment", "unused_assignments"); - self.register_renamed("unknown_crate_type", "unknown_crate_types"); - self.register_renamed("variant_size_difference", "variant_size_differences"); - self.register_renamed("transmute_fat_ptr", "fat_ptr_transmutes"); + // Insert temporary renamings for a one-time deprecation self.register_renamed("raw_pointer_deriving", "raw_pointer_derive"); } diff --git a/src/test/compile-fail/lint-renaming.rs b/src/test/compile-fail/lint-renaming.rs deleted file mode 100644 index 7ffec37772f..00000000000 --- a/src/test/compile-fail/lint-renaming.rs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// Check that lint deprecation works - -#[deny(unused_variable)] //~ warning: lint unused_variable has been renamed to unused_variables -pub fn main() { - let x = 0u8; //~ error: unused variable: -} diff --git a/src/test/compile-fail/lint-type-limits.rs b/src/test/compile-fail/lint-type-limits.rs index a2bc464ac49..3eae12f234f 100644 --- a/src/test/compile-fail/lint-type-limits.rs +++ b/src/test/compile-fail/lint-type-limits.rs @@ -10,7 +10,7 @@ #![allow(dead_code)] -// compile-flags: -D type-limits +// compile-flags: -D unused-comparisons fn main() { } fn foo() { diff --git a/src/test/compile-fail/warn-path-statement.rs b/src/test/compile-fail/warn-path-statement.rs index 304900df776..d205e2a2e4e 100644 --- a/src/test/compile-fail/warn-path-statement.rs +++ b/src/test/compile-fail/warn-path-statement.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: -D path-statement +// compile-flags: -D path-statements fn main() { let x = 10is; diff --git a/src/test/run-pass/crate-name-attr-used.rs b/src/test/run-pass/crate-name-attr-used.rs index 95c7d331264..f04a760e5f6 100644 --- a/src/test/run-pass/crate-name-attr-used.rs +++ b/src/test/run-pass/crate-name-attr-used.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags:--crate-name crate-name-attr-used -F unused-attribute +// compile-flags:--crate-name crate-name-attr-used -F unused-attributes #![crate_name = "crate-name-attr-used"] diff --git a/src/test/run-pass/warn-ctypes-inhibit.rs b/src/test/run-pass/warn-ctypes-inhibit.rs index 93112e3e7ec..73121918259 100644 --- a/src/test/run-pass/warn-ctypes-inhibit.rs +++ b/src/test/run-pass/warn-ctypes-inhibit.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags:-D ctypes +// compile-flags:-D improper-ctypes -#![allow(ctypes)] +#![allow(improper_ctypes)] mod libc { extern {