rollup merge of #18398 : aturon/lint-conventions-2

Conflicts: src/libcollections/slice.rs src/libcore/failure.rs src/libsyntax/parse/token.rs src/test/debuginfo/basic-types-mut-globals.rs src/test/debuginfo/simple-struct.rs src/test/debuginfo/trait-pointers.rs
2014-10-30 09:02:07 -07:00
parent f68dafa505 d9eb13b2c8
commit 00975e041d
179 changed files with 285 additions and 271 deletions
--- a/src/libstd/rand/os.rs
+++ b/src/libstd/rand/os.rs
@@ -88,7 +88,7 @@ mod imp {
    #[repr(C)]
    struct SecRandom;

-    #[allow(non_uppercase_statics)]
+    #[allow(non_upper_case_globals)]
    static kSecRandomDefault: *const SecRandom = 0 as *const SecRandom;

    #[link(name = "Security", kind = "framework")]