about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorStefan Plantikow <stefan.plantikow@googlemail.com>2012-01-05 17:11:34 +0100
committerStefan Plantikow <stefan.plantikow@googlemail.com>2012-01-05 17:11:34 +0100
commit1f10ee365c840cb5d54fe4eb32659f09d29ace38 (patch)
treef0b1124f234420be8db4bb39b32333f3c85f35c8 /src/libstd
parent494ad4e601834f1b28e58c1c0ba579c2972c9a27 (diff)
downloadrust-1f10ee365c840cb5d54fe4eb32659f09d29ace38.tar.gz
rust-1f10ee365c840cb5d54fe4eb32659f09d29ace38.zip
Moved generic float::min, max to core::math and cleaned up some imports
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rope.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index 6b821dc6223..8071ee72847 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -26,10 +26,6 @@ The following operations are algorithmically faster in ropes:
  */
 
 
-import core::option;
-
-
-
 /*
  Type: rope
 
@@ -1103,7 +1099,7 @@ mod node {
                      right   : right,
              char_len: char_len(left) + char_len(right),
                      byte_len: byte_len(left) + byte_len(right),
-             height: float::max(height(left), height(right)) + 1u
+             height: math::max(height(left), height(right)) + 1u
                     })
     }