about summary refs log tree commit diff
path: root/src/libstd/priority_queue.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-05-09 14:14:42 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-05-12 16:33:15 -0700
commit06ef889cdc77db862d526bf6a607ecdf3ee80beb (patch)
tree12ef3b970735baece127e674d7feb82bd6a5d9da /src/libstd/priority_queue.rs
parent830b945a9db072b68970b6f83dfafc1aaff8f837 (diff)
downloadrust-06ef889cdc77db862d526bf6a607ecdf3ee80beb.tar.gz
rust-06ef889cdc77db862d526bf6a607ecdf3ee80beb.zip
libsyntax: Remove `extern mod foo { ... }` from the language.
Diffstat (limited to 'src/libstd/priority_queue.rs')
-rw-r--r--src/libstd/priority_queue.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs
index ded632b29d9..5b3f3e6efa7 100644
--- a/src/libstd/priority_queue.rs
+++ b/src/libstd/priority_queue.rs
@@ -14,7 +14,7 @@ use core::old_iter::BaseIter;
 use core::util::{replace, swap};
 
 #[abi = "rust-intrinsic"]
-extern "rust-intrinsic" mod rusti {
+extern "rust-intrinsic" {
     fn move_val_init<T>(dst: &mut T, src: T);
     fn init<T>() -> T;
     #[cfg(not(stage0))]
@@ -154,13 +154,13 @@ pub impl <T:Ord> PriorityQueue<T> {
                 let parent = (pos - 1) >> 1;
                 if new > self.data[parent] {
                     let x = replace(&mut self.data[parent], rusti::uninit());
-                    rusti::move_val_init(&mut self.data[pos], x);
+                    move_val_init(&mut self.data[pos], x);
                     pos = parent;
                     loop
                 }
                 break
             }
-            rusti::move_val_init(&mut self.data[pos], new);
+            move_val_init(&mut self.data[pos], new);
         }
     }
 
@@ -173,13 +173,13 @@ pub impl <T:Ord> PriorityQueue<T> {
                 let parent = (pos - 1) >> 1;
                 if new > self.data[parent] {
                     let x = replace(&mut self.data[parent], rusti::init());
-                    rusti::move_val_init(&mut self.data[pos], x);
+                    move_val_init(&mut self.data[pos], x);
                     pos = parent;
                     loop
                 }
                 break
             }
-            rusti::move_val_init(&mut self.data[pos], new);
+            move_val_init(&mut self.data[pos], new);
         }
     }
 
@@ -197,12 +197,12 @@ pub impl <T:Ord> PriorityQueue<T> {
                     child = right;
                 }
                 let x = replace(&mut self.data[child], rusti::uninit());
-                rusti::move_val_init(&mut self.data[pos], x);
+                move_val_init(&mut self.data[pos], x);
                 pos = child;
                 child = 2 * pos + 1;
             }
 
-            rusti::move_val_init(&mut self.data[pos], new);
+            move_val_init(&mut self.data[pos], new);
             self.siftup(start, pos);
         }
     }
@@ -220,12 +220,12 @@ pub impl <T:Ord> PriorityQueue<T> {
                     child = right;
                 }
                 let x = replace(&mut self.data[child], rusti::init());
-                rusti::move_val_init(&mut self.data[pos], x);
+                move_val_init(&mut self.data[pos], x);
                 pos = child;
                 child = 2 * pos + 1;
             }
 
-            rusti::move_val_init(&mut self.data[pos], new);
+            move_val_init(&mut self.data[pos], new);
             self.siftup(start, pos);
         }
     }