auto merge of #6417 : pcwalton/rust/exprs-in-patterns, r=pcwalton

r? @graydon

1 files changed, 13 insertions, 13 deletions

diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs
index ded632b29d9..c5ab1a7719c 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))]
@@ -153,14 +153,14 @@ pub impl <T:Ord> PriorityQueue<T> {
             while pos > start {
                 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);
+                    let x = replace(&mut self.data[parent], uninit());
+                    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);
         }
     }
 
@@ -172,14 +172,14 @@ pub impl <T:Ord> PriorityQueue<T> {
             while pos > start {
                 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);
+                    let x = replace(&mut self.data[parent], init());
+                    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);
         }
     }
 
@@ -196,13 +196,13 @@ pub impl <T:Ord> PriorityQueue<T> {
                 if right < end && !(self.data[child] > self.data[right]) {
                     child = right;
                 }
-                let x = replace(&mut self.data[child], rusti::uninit());
-                rusti::move_val_init(&mut self.data[pos], x);
+                let x = replace(&mut self.data[child], uninit());
+                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);
         }
     }
@@ -219,13 +219,13 @@ pub impl <T:Ord> PriorityQueue<T> {
                 if right < end && !(self.data[child] > self.data[right]) {
                     child = right;
                 }
-                let x = replace(&mut self.data[child], rusti::init());
-                rusti::move_val_init(&mut self.data[pos], x);
+                let x = replace(&mut self.data[child], init());
+                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);
         }
     }