diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2013-07-01 13:51:13 +1000 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2013-07-01 17:52:57 +1000 |
| commit | c437a16c5d8c00b39dc6c5e36011def997d77224 (patch) | |
| tree | ba408e4897a59f96ba64a82c07f1307a2af8658a /src/libstd/num | |
| parent | da4384583b84c262dec82be4b041f0332ca16e57 (diff) | |
| download | rust-c437a16c5d8c00b39dc6c5e36011def997d77224.tar.gz rust-c437a16c5d8c00b39dc6c5e36011def997d77224.zip | |
rustc: add a lint to enforce uppercase statics.
Diffstat (limited to 'src/libstd/num')
| -rw-r--r-- | src/libstd/num/cmath.rs | 1 | ||||
| -rw-r--r-- | src/libstd/num/f32.rs | 1 | ||||
| -rw-r--r-- | src/libstd/num/f64.rs | 1 | ||||
| -rw-r--r-- | src/libstd/num/float.rs | 1 | ||||
| -rw-r--r-- | src/libstd/num/int.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/int_macros.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/strconv.rs | 14 | ||||
| -rw-r--r-- | src/libstd/num/uint_macros.rs | 2 |
8 files changed, 17 insertions, 7 deletions
diff --git a/src/libstd/num/cmath.rs b/src/libstd/num/cmath.rs index 96d3b79e338..c89fc73693c 100644 --- a/src/libstd/num/cmath.rs +++ b/src/libstd/num/cmath.rs @@ -9,6 +9,7 @@ // except according to those terms. #[allow(missing_doc)]; +#[allow(non_uppercase_statics)]; // function names are almost identical to C's libmath, a few have been // renamed, grep for "rename:" diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index 0b6eb766b29..a84c27cd918 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -10,6 +10,7 @@ //! Operations and constants for `f32` #[allow(missing_doc)]; +#[allow(non_uppercase_statics)]; use libc::c_int; use num::{Zero, One, strconv}; diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index c39c7a3a57d..216963e0414 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -11,6 +11,7 @@ //! Operations and constants for `f64` #[allow(missing_doc)]; +#[allow(non_uppercase_statics)]; use libc::c_int; use num::{Zero, One, strconv}; diff --git a/src/libstd/num/float.rs b/src/libstd/num/float.rs index 7a6e3042e7b..d73ff16c6f7 100644 --- a/src/libstd/num/float.rs +++ b/src/libstd/num/float.rs @@ -21,6 +21,7 @@ // PORT this must match in width according to architecture #[allow(missing_doc)]; +#[allow(non_uppercase_statics)]; use f64; use libc::c_int; diff --git a/src/libstd/num/int.rs b/src/libstd/num/int.rs index d3c2733b47d..d39b4b2b911 100644 --- a/src/libstd/num/int.rs +++ b/src/libstd/num/int.rs @@ -10,6 +10,8 @@ //! Operations and constants for `int` +#[allow(non_uppercase_statics)]; + use num::BitCount; pub use self::generated::*; diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index f152d60cb7a..c2eebf9a3e4 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -14,6 +14,8 @@ macro_rules! int_module (($T:ty, $bits:expr) => (mod generated { +#[allow(non_uppercase_statics)]; + use num::{ToStrRadix, FromStrRadix}; use num::{Zero, One, strconv}; use prelude::*; diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index f6dff4267b7..337d804ce73 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -101,12 +101,12 @@ impl_NumStrConv_Integer!(u64) // Special value strings as [u8] consts. -static inf_buf: [u8, ..3] = ['i' as u8, 'n' as u8, 'f' as u8]; -static positive_inf_buf: [u8, ..4] = ['+' as u8, 'i' as u8, 'n' as u8, +static INF_BUF: [u8, ..3] = ['i' as u8, 'n' as u8, 'f' as u8]; +static POS_INF_BUF: [u8, ..4] = ['+' as u8, 'i' as u8, 'n' as u8, 'f' as u8]; -static negative_inf_buf: [u8, ..4] = ['-' as u8, 'i' as u8, 'n' as u8, +static NEG_INF_BUF: [u8, ..4] = ['-' as u8, 'i' as u8, 'n' as u8, 'f' as u8]; -static nan_buf: [u8, ..3] = ['N' as u8, 'a' as u8, 'N' as u8]; +static NAN_BUF: [u8, ..3] = ['N' as u8, 'a' as u8, 'N' as u8]; /** * Converts an integral number to its string representation as a byte vector. @@ -506,15 +506,15 @@ pub fn from_str_bytes_common<T:NumCast+Zero+One+Eq+Ord+Copy+Div<T,T>+ } if special { - if buf == inf_buf || buf == positive_inf_buf { + if buf == INF_BUF || buf == POS_INF_BUF { return NumStrConv::inf(); - } else if buf == negative_inf_buf { + } else if buf == NEG_INF_BUF { if negative { return NumStrConv::neg_inf(); } else { return None; } - } else if buf == nan_buf { + } else if buf == NAN_BUF { return NumStrConv::NaN(); } } diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index 25e338fcd0f..d185b2a05a8 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -14,6 +14,8 @@ macro_rules! uint_module (($T:ty, $T_SIGNED:ty, $bits:expr) => (mod generated { +#[allow(non_uppercase_statics)]; + use num::BitCount; use num::{ToStrRadix, FromStrRadix}; use num::{Zero, One, strconv}; |
