From 58a37a1f485a738f6802b42dd39437618b18bbae Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Sun, 12 May 2013 17:36:53 -0700
Subject: libstd: Fix merge fallout.

---
 src/libstd/priority_queue.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs
index 5b3f3e6efa7..c5ab1a7719c 100644
--- a/src/libstd/priority_queue.rs
+++ b/src/libstd/priority_queue.rs
@@ -153,7 +153,7 @@ 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());
+                    let x = replace(&mut self.data[parent], uninit());
                     move_val_init(&mut self.data[pos], x);
                     pos = parent;
                     loop
@@ -172,7 +172,7 @@ 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());
+                    let x = replace(&mut self.data[parent], init());
                     move_val_init(&mut self.data[pos], x);
                     pos = parent;
                     loop
@@ -196,7 +196,7 @@ 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());
+                let x = replace(&mut self.data[child], uninit());
                 move_val_init(&mut self.data[pos], x);
                 pos = child;
                 child = 2 * pos + 1;
@@ -219,7 +219,7 @@ 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());
+                let x = replace(&mut self.data[child], init());
                 move_val_init(&mut self.data[pos], x);
                 pos = child;
                 child = 2 * pos + 1;
-- 
cgit 1.4.1-3-g733a5