diff options
| author | Marvin Löbel <loebel.marvin@gmail.com> | 2013-11-29 20:19:22 +0100 |
|---|---|---|
| committer | Marvin Löbel <loebel.marvin@gmail.com> | 2013-11-29 20:19:22 +0100 |
| commit | 0d8ace823b33489284cc60aaab3945d764ab3394 (patch) | |
| tree | 3d4bae10d8c7bbd0cbe726db25c542675c546d8b /src/libstd | |
| parent | 90f9eb3b1ef30ea07ae16f9445a8ab0d97269917 (diff) | |
| download | rust-0d8ace823b33489284cc60aaab3945d764ab3394.tar.gz rust-0d8ace823b33489284cc60aaab3945d764ab3394.zip | |
Removed useless cmp::{min, max} reexports from the integer modules
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fmt/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/int_macros.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/uint_macros.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/logging.rs | 3 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index 2d37d82e172..c74a9bc9051 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -901,7 +901,7 @@ impl<'self> Formatter<'self> { // case where the maximum length will matter. let char_len = s.char_len(); if char_len >= max { - let nchars = ::uint::min(max, char_len); + let nchars = ::cmp::min(max, char_len); self.buf.write(s.slice_chars(0, nchars).as_bytes()); return } diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index 42f0ed95d1e..07893087628 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -25,8 +25,6 @@ use num::{CheckedDiv, Zero, One, strconv}; use prelude::*; use str; -pub use cmp::{min, max}; - pub static bits : uint = $bits; pub static bytes : uint = ($bits / 8); diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index 0a21aa9fcc8..31f1b75e02e 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -26,8 +26,6 @@ use num::{CheckedDiv, Zero, One, strconv}; use prelude::*; use str; -pub use cmp::{min, max}; - pub static bits : uint = $bits; pub static bytes : uint = ($bits / 8); diff --git a/src/libstd/rt/logging.rs b/src/libstd/rt/logging.rs index 13e18f7d9b7..3f169b511df 100644 --- a/src/libstd/rt/logging.rs +++ b/src/libstd/rt/logging.rs @@ -17,7 +17,6 @@ use io::stdio::StdWriter; use io::buffered::LineBufferedWriter; use rt::crate_map::{ModEntry, CrateMap, iter_crate_map, get_crate_map}; use str::StrSlice; -use u32; use vec::ImmutableVector; #[cfg(test)] use cast::transmute; @@ -46,7 +45,7 @@ fn parse_log_level(level: &str) -> Option<u32> { let position = log_level_names.iter().position(|&name| name == level); match position { Some(position) => { - log_level = Some(u32::min(MAX_LOG_LEVEL, (position + 1) as u32)) + log_level = Some(::cmp::min(MAX_LOG_LEVEL, (position + 1) as u32)) }, _ => { log_level = None; |
