about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-13 19:16:59 -0800
committerbors <bors@rust-lang.org>2014-02-13 19:16:59 -0800
commit68129d299b54806b6aa4ec9f3a0755854db7b491 (patch)
treee68b861deca38e786ea5a22a32999de0630c27c7 /src/libsyntax
parent89b1686bd7db25b5dd948b1a4d9dfd0c68084c29 (diff)
parentbf1464c413bb2564c7be0eaceef9515bc0f94f1f (diff)
downloadrust-68129d299b54806b6aa4ec9f3a0755854db7b491.tar.gz
rust-68129d299b54806b6aa4ec9f3a0755854db7b491.zip
auto merge of #12061 : pongad/rust/delorderable, r=cmr
#12057
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ast_util.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index 5f72a255d71..56f690f0e2b 100644
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -18,10 +18,10 @@ use visit::Visitor;
 use visit;
 
 use std::cell::{Cell, RefCell};
+use std::cmp;
 use std::hashmap::HashMap;
 use std::u32;
 use std::local_data;
-use std::num;
 
 pub fn path_name_i(idents: &[Ident]) -> ~str {
     // FIXME: Bad copies (#2543 -- same for everything else that says "bad")
@@ -343,8 +343,8 @@ impl IdRange {
     }
 
     pub fn add(&mut self, id: NodeId) {
-        self.min = num::min(self.min, id);
-        self.max = num::max(self.max, id + 1);
+        self.min = cmp::min(self.min, id);
+        self.max = cmp::max(self.max, id + 1);
     }
 }