Change lint names to plurals

Nick Cameron · Nick Cameron · commit e7122a5a09d0 · 2015-03-25T10:06:13.000+13:00
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
@@ -24,8 +24,8 @@
        html_playground_url = "http://play.rust-lang.org/")]
 #![doc(test(no_crate_inject))]
 
-#![allow(trivial_cast)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_casts)]
+#![allow(trivial_numeric_casts)]
 #![feature(alloc)]
 #![feature(box_syntax)]
 #![feature(box_patterns)]
diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs
@@ -715,7 +715,7 @@ impl<T> UnsafeCell<T> {
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn get(&self) -> *mut T {
         // FIXME(#23542) Replace with type ascription.
-        #![allow(trivial_cast)]
+        #![allow(trivial_casts)]
         &self.value as *const T as *mut T
     }
 
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
@@ -834,7 +834,7 @@ impl<T> Pointer for *const T {
 impl<T> Pointer for *mut T {
     fn fmt(&self, f: &mut Formatter) -> Result {
         // FIXME(#23542) Replace with type ascription.
-        #![allow(trivial_cast)]
+        #![allow(trivial_casts)]
         Pointer::fmt(&(*self as *const T), f)
     }
 }
@@ -843,7 +843,7 @@ impl<T> Pointer for *mut T {
 impl<'a, T> Pointer for &'a T {
     fn fmt(&self, f: &mut Formatter) -> Result {
         // FIXME(#23542) Replace with type ascription.
-        #![allow(trivial_cast)]
+        #![allow(trivial_casts)]
         Pointer::fmt(&(*self as *const T), f)
     }
 }
@@ -852,7 +852,7 @@ impl<'a, T> Pointer for &'a T {
 impl<'a, T> Pointer for &'a mut T {
     fn fmt(&self, f: &mut Formatter) -> Result {
         // FIXME(#23542) Replace with type ascription.
-        #![allow(trivial_cast)]
+        #![allow(trivial_casts)]
         Pointer::fmt(&(&**self as *const T), f)
     }
 }
diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs
@@ -13,7 +13,7 @@
 // FIXME: #6220 Implement floating point formatting
 
 #![allow(unsigned_negation)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 use fmt;
 use iter::IteratorExt;
diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs
@@ -183,7 +183,7 @@ mod impls {
 
                 fn hash_slice<H: Hasher>(data: &[$ty], state: &mut H) {
                     // FIXME(#23542) Replace with type ascription.
-                    #![allow(trivial_cast)]
+                    #![allow(trivial_casts)]
                     let newlen = data.len() * ::$ty::BYTES as usize;
                     let ptr = data.as_ptr() as *const u8;
                     state.write(unsafe { slice::from_raw_parts(ptr, newlen) })
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
@@ -314,7 +314,7 @@ pub fn drop<T>(_x: T) { }
 #[stable(feature = "rust1", since = "1.0.0")]
 pub unsafe fn transmute_copy<T, U>(src: &T) -> U {
     // FIXME(#23542) Replace with type ascription.
-    #![allow(trivial_cast)]
+    #![allow(trivial_casts)]
     ptr::read(src as *const T as *const U)
 }
 
diff --git a/src/libcore/num/i16.rs b/src/libcore/num/i16.rs
@@ -12,6 +12,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "i16")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 int_module! { i16, 16 }
diff --git a/src/libcore/num/i32.rs b/src/libcore/num/i32.rs
@@ -12,6 +12,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "i32")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 int_module! { i32, 32 }
diff --git a/src/libcore/num/i64.rs b/src/libcore/num/i64.rs
@@ -12,6 +12,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "i64")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 int_module! { i64, 64 }
diff --git a/src/libcore/num/i8.rs b/src/libcore/num/i8.rs
@@ -12,6 +12,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "i8")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 int_module! { i8, 8 }
diff --git a/src/libcore/num/int_macros.rs b/src/libcore/num/int_macros.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #![doc(hidden)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 macro_rules! int_module { ($T:ty, $bits:expr) => (
 
diff --git a/src/libcore/num/isize.rs b/src/libcore/num/isize.rs
@@ -16,7 +16,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "isize")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 #[cfg(target_pointer_width = "32")]
 int_module! { isize, 32 }
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
@@ -14,7 +14,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![allow(missing_docs)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 use self::wrapping::{OverflowingOps, WrappingOps};
 
diff --git a/src/libcore/num/u16.rs b/src/libcore/num/u16.rs
@@ -12,6 +12,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "u16")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 uint_module! { u16, i16, 16 }
diff --git a/src/libcore/num/u32.rs b/src/libcore/num/u32.rs
@@ -12,6 +12,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "u32")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 uint_module! { u32, i32, 32 }
diff --git a/src/libcore/num/u64.rs b/src/libcore/num/u64.rs
@@ -12,6 +12,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "u64")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 uint_module! { u64, i64, 64 }
diff --git a/src/libcore/num/u8.rs b/src/libcore/num/u8.rs
@@ -12,6 +12,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "u8")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 uint_module! { u8, i8, 8 }
diff --git a/src/libcore/num/uint_macros.rs b/src/libcore/num/uint_macros.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #![doc(hidden)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 macro_rules! uint_module { ($T:ty, $T_SIGNED:ty, $bits:expr) => (
 
diff --git a/src/libcore/num/usize.rs b/src/libcore/num/usize.rs
@@ -16,6 +16,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(primitive = "usize")]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 uint_module! { usize, isize, ::isize::BITS }
diff --git a/src/librand/distributions/range.rs b/src/librand/distributions/range.rs
@@ -10,7 +10,7 @@
 
 //! Generating numbers between two others.
 
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_numeric_casts)]
 
 // this is surprisingly complicated to be both generic & correct
 
diff --git a/src/librand/isaac.rs b/src/librand/isaac.rs
@@ -447,7 +447,7 @@ impl Rng for Isaac64Rng {
 
     #[inline]
     fn next_u64(&mut self) -> u64 {
-        #![allow(trivial_numeric_cast)]
+        #![allow(trivial_numeric_casts)]
         if self.cnt == 0 {
             // make some more numbers
             self.isaac64();
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
@@ -47,8 +47,8 @@
 #![feature(into_cow)]
 #![cfg_attr(test, feature(test))]
 
-#![allow(trivial_cast)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_casts)]
+#![allow(trivial_numeric_casts)]
 
 extern crate arena;
 extern crate flate;
diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
@@ -101,13 +101,13 @@ declare_lint! {
 }
 
 declare_lint! {
-    pub TRIVIAL_CAST,
+    pub TRIVIAL_CASTS,
     Warn,
     "detects trivial casts which could be removed"
 }
 
 declare_lint! {
-    pub TRIVIAL_NUMERIC_CAST,
+    pub TRIVIAL_NUMERIC_CASTS,
     Warn,
     "detects trivial casts of numeric types which could be removed"
 }
@@ -133,8 +133,8 @@ impl LintPass for HardwiredLints {
             UNKNOWN_CRATE_TYPES,
             VARIANT_SIZE_DIFFERENCES,
             FAT_PTR_TRANSMUTES,
-            TRIVIAL_CAST,
-            TRIVIAL_NUMERIC_CAST
+            TRIVIAL_CASTS,
+            TRIVIAL_NUMERIC_CASTS
         )
     }
 }
diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs
@@ -1781,7 +1781,7 @@ impl LintPass for UnconditionalRecursion {
     fn check_fn(&mut self, cx: &Context, fn_kind: visit::FnKind, _: &ast::FnDecl,
                 blk: &ast::Block, sp: Span, id: ast::NodeId) {
         // FIXME(#23542) Replace with type ascription.
-        #![allow(trivial_cast)]
+        #![allow(trivial_casts)]
 
         type F = for<'tcx> fn(&ty::ctxt<'tcx>,
                               ast::NodeId, ast::NodeId, ast::Ident, ast::NodeId) -> bool;
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs
@@ -14,8 +14,8 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(dead_code)]
-#![allow(trivial_cast)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_casts)]
+#![allow(trivial_numeric_casts)]
 
 #![crate_name = "rustc_llvm"]
 #![unstable(feature = "rustc_private")]
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
@@ -43,8 +43,8 @@
 #![feature(convert)]
 #![feature(path_relative_from)]
 
-#![allow(trivial_cast)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_casts)]
+#![allow(trivial_numeric_casts)]
 
 extern crate arena;
 extern crate flate;
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
@@ -1088,14 +1088,14 @@ fn check_cast<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>, cast: &CastCheck<'tcx>) {
     if !ty::type_has_ty_infer(t_1) {
         if let Ok(()) = coercion::mk_assignty(fcx, e, t_e, t_1) {
             if ty::type_is_numeric(t_1) && ty::type_is_numeric(t_e) {
-                fcx.tcx().sess.add_lint(lint::builtin::TRIVIAL_NUMERIC_CAST,
+                fcx.tcx().sess.add_lint(lint::builtin::TRIVIAL_NUMERIC_CASTS,
                                         e.id,
                                         span,
                                         format!("trivial numeric cast: `{}` as `{}`",
                                                 fcx.infcx().ty_to_string(t_e),
                                                 fcx.infcx().ty_to_string(t_1)));
             } else {
-                fcx.tcx().sess.add_lint(lint::builtin::TRIVIAL_CAST,
+                fcx.tcx().sess.add_lint(lint::builtin::TRIVIAL_CASTS,
                                         e.id,
                                         span,
                                         format!("trivial cast: `{}` as `{}`",
@@ -4581,7 +4581,7 @@ pub fn check_enum_variants<'a,'tcx>(ccx: &CrateCtxt<'a,'tcx>,
                      ty: attr::IntType,
                      disr: ty::Disr) -> bool {
         fn uint_in_range(ccx: &CrateCtxt, ty: ast::UintTy, disr: ty::Disr) -> bool {
-            #![allow(trivial_numeric_cast)]
+            #![allow(trivial_numeric_casts)]
 
             match ty {
                 ast::TyU8 => disr as u8 as Disr == disr,
@@ -4611,7 +4611,7 @@ pub fn check_enum_variants<'a,'tcx>(ccx: &CrateCtxt<'a,'tcx>,
                           id: ast::NodeId,
                           hint: attr::ReprAttr)
                           -> Vec<Rc<ty::VariantInfo<'tcx>>> {
-        #![allow(trivial_numeric_cast)]
+        #![allow(trivial_numeric_casts)]
         use std::num::Int;
 
         let rty = ty::node_id_to_type(ccx.tcx, id);
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
@@ -2430,7 +2430,7 @@ macro_rules! to_json_impl_i64 {
     ($($t:ty), +) => (
         $(impl ToJson for $t {
             fn to_json(&self) -> Json {
-                #![allow(trivial_numeric_cast)]
+                #![allow(trivial_numeric_casts)]
                 Json::I64(*self as i64)
             }
         })+
@@ -2443,7 +2443,7 @@ macro_rules! to_json_impl_u64 {
     ($($t:ty), +) => (
         $(impl ToJson for $t {
             fn to_json(&self) -> Json {
-                #![allow(trivial_numeric_cast)]
+                #![allow(trivial_numeric_casts)]
                 Json::U64(*self as u64)
             }
         })+
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
@@ -135,8 +135,8 @@
 #![feature(no_std)]
 #![no_std]
 
-#![allow(trivial_cast)]
-#![allow(trivial_numeric_cast)]
+#![allow(trivial_casts)]
+#![allow(trivial_numeric_casts)]
 #![deny(missing_docs)]
 
 #[cfg(test)] extern crate test;
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs
@@ -262,7 +262,7 @@ pub mod rt {
         (unsigned, $t:ty, $tag:expr) => (
             impl ToSource for $t {
                 fn to_source(&self) -> String {
-                    #![allow(trivial_numeric_cast)]
+                    #![allow(trivial_numeric_casts)]
                     let lit = ast::LitInt(*self as u64, ast::UnsignedIntLit($tag));
                     pprust::lit_to_string(&dummy_spanned(lit))
                 }
diff --git a/src/test/compile-fail/liveness-unused.rs b/src/test/compile-fail/liveness-unused.rs
@@ -10,7 +10,7 @@
 
 #![deny(unused_variables)]
 #![deny(unused_assignments)]
-#![allow(dead_code, non_camel_case_types, trivial_numeric_cast)]
+#![allow(dead_code, non_camel_case_types, trivial_numeric_casts)]
 
 fn f1(x: isize) {
     //~^ ERROR unused variable: `x`
diff --git a/src/test/compile-fail/object-safety-by-value-self.rs b/src/test/compile-fail/object-safety-by-value-self.rs
@@ -12,7 +12,7 @@
 
 #![feature(rustc_attrs)]
 #![allow(dead_code)]
-#![allow(trivial_cast)]
+#![allow(trivial_casts)]
 
 trait Bar {
     fn bar(self);
diff --git a/src/test/compile-fail/trivial_casts.rs b/src/test/compile-fail/trivial_casts.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Test the trivial_cast and trivial_numeric_cast lints. For each error we also
+// Test the trivial_casts and trivial_numeric_casts lints. For each error we also
 // check that the cast can be done using just coercion.
 
-#![deny(trivial_cast, trivial_numeric_cast)]
+#![deny(trivial_casts, trivial_numeric_casts)]
 
 trait Foo {
     fn foo(&self) {}
diff --git a/src/test/run-pass/trivial_casts.rs b/src/test/run-pass/trivial_casts.rs
@@ -10,7 +10,7 @@
 
 // Test that all coercions can actually be done using casts (modulo the lints).
 
-#![allow(trivial_cast, trivial_numeric_cast)]
+#![allow(trivial_casts, trivial_numeric_casts)]
 
 trait Foo {
     fn foo(&self) {}

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ impl<T> UnsafeCell<T> {`
`715`	`715`	`#[stable(feature = "rust1", since = "1.0.0")]`
`716`	`716`	`pub fn get(&self) -> *mut T {`
`717`	`717`	`// FIXME(#23542) Replace with type ascription.`
`718`		`- #![allow(trivial_cast)]`
	`718`	`+ #![allow(trivial_casts)]`
`719`	`719`	`&self.value as const T as mut T`
`720`	`720`	`}`
`721`	`721`
Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ impl<T> Pointer for *const T {`
`834`	`834`	`impl<T> Pointer for *mut T {`
`835`	`835`	`fn fmt(&self, f: &mut Formatter) -> Result {`
`836`	`836`	`// FIXME(#23542) Replace with type ascription.`
`837`		`- #![allow(trivial_cast)]`
	`837`	`+ #![allow(trivial_casts)]`
`838`	`838`	`Pointer::fmt(&(self as const T), f)`
`839`	`839`	`}`
`840`	`840`	`}`
`@@ -843,7 +843,7 @@ impl<T> Pointer for *mut T {`
`843`	`843`	`impl<'a, T> Pointer for &'a T {`
`844`	`844`	`fn fmt(&self, f: &mut Formatter) -> Result {`
`845`	`845`	`// FIXME(#23542) Replace with type ascription.`
`846`		`- #![allow(trivial_cast)]`
	`846`	`+ #![allow(trivial_casts)]`
`847`	`847`	`Pointer::fmt(&(self as const T), f)`
`848`	`848`	`}`
`849`	`849`	`}`
`@@ -852,7 +852,7 @@ impl<'a, T> Pointer for &'a T {`
`852`	`852`	`impl<'a, T> Pointer for &'a mut T {`
`853`	`853`	`fn fmt(&self, f: &mut Formatter) -> Result {`
`854`	`854`	`// FIXME(#23542) Replace with type ascription.`
`855`		`- #![allow(trivial_cast)]`
	`855`	`+ #![allow(trivial_casts)]`
`856`	`856`	`Pointer::fmt(&(&*self as const T), f)`
`857`	`857`	`}`
`858`	`858`	`}`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ pub fn drop<T>(_x: T) { }`
`314`	`314`	`#[stable(feature = "rust1", since = "1.0.0")]`
`315`	`315`	`pub unsafe fn transmute_copy<T, U>(src: &T) -> U {`
`316`	`316`	`// FIXME(#23542) Replace with type ascription.`
`317`		`- #![allow(trivial_cast)]`
	`317`	`+ #![allow(trivial_casts)]`
`318`	`318`	`ptr::read(src as const T as const U)`
`319`	`319`	`}`
`320`	`320`