about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-11-29 14:01:48 -0800
committerbors <bors@rust-lang.org>2013-11-29 14:01:48 -0800
commit80991bb578329ca921fdc910d9b6b064e8f521d2 (patch)
treeaa303d7064dc72da11ace2e5782078be1136e9c1 /src/libstd/rt
parentdd1184eedb0e0828cea2f18d3fbd6319e981afda (diff)
parent4840064f85a28c9332d928ad0631e9dc2d21e150 (diff)
downloadrust-80991bb578329ca921fdc910d9b6b064e8f521d2.tar.gz
rust-80991bb578329ca921fdc910d9b6b064e8f521d2.zip
auto merge of #10719 : Kimundi/rust/switch_to_multi_item_macros, r=alexcrichton
- Removed module reexport workaround for the integer module macros
- Removed legacy reexports of `cmp::{min, max}` in the integer module macros
- Combined a few macros in `vec` into one
- Documented a few issues

Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/logging.rs3
1 files changed, 1 insertions, 2 deletions
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;