From 13b474dcbb2dd7bc58286f8b7a40bb83117e1b03 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 20 Jul 2013 19:59:58 -0400 Subject: [PATCH] rm obsolete no-op lints --- src/etc/extract-tests.py | 3 --- src/etc/zsh/_rust | 3 --- src/librustc/middle/lint.rs | 16 ---------------- src/librustc/rustc.rs | 2 -- src/libstd/result.rs | 1 - src/libstd/tuple.rs | 1 - src/libsyntax/syntax.rs | 2 -- src/test/run-pass-fulldeps/quote-tokens.rs | 2 -- src/test/run-pass/auto-encode.rs | 2 -- src/test/run-pass/fixed_length_copy.rs | 4 ---- src/test/run-pass/issue-2550.rs | 1 - 11 files changed, 37 deletions(-) diff --git a/src/etc/extract-tests.py b/src/etc/extract-tests.py index 0260789adfc..91b3b814ce0 100644 --- a/src/etc/extract-tests.py +++ b/src/etc/extract-tests.py @@ -60,9 +60,6 @@ while cur < len(lines): if not re.search(r"\bextern mod extra\b", block): block = "extern mod extra;\n" + block block = """#[ forbid(ctypes) ]; -#[ forbid(deprecated_pattern) ]; -#[ forbid(implicit_copies) ]; -#[ forbid(non_implicitly_copyable_typarams) ]; #[ forbid(path_statement) ]; #[ forbid(type_limits) ]; #[ forbid(unrecognized_lint) ]; diff --git a/src/etc/zsh/_rust b/src/etc/zsh/_rust index 86dcbab93fd..befed411dd1 100644 --- a/src/etc/zsh/_rust +++ b/src/etc/zsh/_rust @@ -33,12 +33,9 @@ _rustc_opts_switches=( ) _rustc_opts_lint=( 'path-statement[path statements with no effect]' - 'deprecated-pattern[warn about deprecated uses of pattern bindings]' - 'non-implicitly-copyable-typarams[passing non implicitly copyable types as copy type params]' 'missing-trait-doc[detects missing documentation for traits]' 'missing-struct-doc[detects missing documentation for structs]' 'ctypes[proper use of core::libc types in foreign modules]' - 'implicit-copies[implicit copies of non implicitly copyable data]' "unused-mut[detect mut variables which don't need to be mutable]" 'unused-imports[imports that are never used]' 'heap-memory[use of any (~ type or @ type) heap memory]' diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs index 486939be58d..206e34a5f40 100644 --- a/src/librustc/middle/lint.rs +++ b/src/librustc/middle/lint.rs @@ -74,9 +74,7 @@ pub enum lint { unnecessary_qualification, while_true, path_statement, - implicit_copies, unrecognized_lint, - deprecated_pattern, non_camel_case_types, non_uppercase_statics, type_limits, @@ -181,20 +179,6 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[ default: warn }), - ("implicit_copies", - LintSpec { - lint: implicit_copies, - desc: "implicit copies of non implicitly copyable data", - default: warn - }), - - ("deprecated_pattern", - LintSpec { - lint: deprecated_pattern, - desc: "warn about deprecated uses of pattern bindings", - default: allow - }), - ("non_camel_case_types", LintSpec { lint: non_camel_case_types, diff --git a/src/librustc/rustc.rs b/src/librustc/rustc.rs index de2125c2e0e..e97f67ceb9c 100644 --- a/src/librustc/rustc.rs +++ b/src/librustc/rustc.rs @@ -17,8 +17,6 @@ #[license = "MIT/ASL2"]; #[crate_type = "lib"]; -#[deny(deprecated_pattern)]; - extern mod extra; extern mod syntax; diff --git a/src/libstd/result.rs b/src/libstd/result.rs index 4fdcf9bb0b3..acc4ece8fd5 100644 --- a/src/libstd/result.rs +++ b/src/libstd/result.rs @@ -396,7 +396,6 @@ pub fn unwrap_err(res: Result) -> U { } #[cfg(test)] -#[allow(non_implicitly_copyable_typarams)] mod tests { use result::{Err, Ok, Result, chain, get, get_err}; use result; diff --git a/src/libstd/tuple.rs b/src/libstd/tuple.rs index 6201e753bc9..41af29022a6 100644 --- a/src/libstd/tuple.rs +++ b/src/libstd/tuple.rs @@ -384,7 +384,6 @@ mod tests { } #[test] - #[allow(non_implicitly_copyable_typarams)] fn test_tuple() { assert_eq!((948, 4039.48).first(), 948); assert_eq!((34.5, ~"foo").second(), ~"foo"); diff --git a/src/libsyntax/syntax.rs b/src/libsyntax/syntax.rs index 7a1e9923ab7..3384dabeab7 100644 --- a/src/libsyntax/syntax.rs +++ b/src/libsyntax/syntax.rs @@ -20,8 +20,6 @@ #[license = "MIT/ASL2"]; #[crate_type = "lib"]; -#[deny(deprecated_pattern)]; - extern mod extra; pub mod util { diff --git a/src/test/run-pass-fulldeps/quote-tokens.rs b/src/test/run-pass-fulldeps/quote-tokens.rs index 0cd416afc83..0a929e2d128 100644 --- a/src/test/run-pass-fulldeps/quote-tokens.rs +++ b/src/test/run-pass-fulldeps/quote-tokens.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[allow(non_implicitly_copyable_typarams)]; - extern mod syntax; use syntax::ext::base::ExtCtxt; diff --git a/src/test/run-pass/auto-encode.rs b/src/test/run-pass/auto-encode.rs index 6e5b837e0aa..c1629851c5f 100644 --- a/src/test/run-pass/auto-encode.rs +++ b/src/test/run-pass/auto-encode.rs @@ -12,8 +12,6 @@ // xfail-test #6122 -#[forbid(deprecated_pattern)]; - extern mod extra; // These tests used to be separate files, but I wanted to refactor all diff --git a/src/test/run-pass/fixed_length_copy.rs b/src/test/run-pass/fixed_length_copy.rs index ead8e5ea104..bbd7b9130e7 100644 --- a/src/test/run-pass/fixed_length_copy.rs +++ b/src/test/run-pass/fixed_length_copy.rs @@ -8,10 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - -// error on implicit copies to check fixed length vectors -// are implicitly copyable -#[deny(implicit_copies)] pub fn main() { let arr = [1,2,3]; let arr2 = arr; diff --git a/src/test/run-pass/issue-2550.rs b/src/test/run-pass/issue-2550.rs index af0b937f602..99c68826502 100644 --- a/src/test/run-pass/issue-2550.rs +++ b/src/test/run-pass/issue-2550.rs @@ -21,7 +21,6 @@ fn C(x: uint) -> C { fn f(_x: T) { } -#[deny(non_implicitly_copyable_typarams)] pub fn main() { f(C(1u)); }