diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-05-12 17:36:53 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-05-12 17:36:53 -0700 |
| commit | 58a37a1f485a738f6802b42dd39437618b18bbae (patch) | |
| tree | 837010feec6db4c5c2f9be6eb1c62de90e9d57b8 /src/libstd/priority_queue.rs | |
| parent | db0693ac8d06202a289f451c223eb6f514819ffe (diff) | |
| download | rust-58a37a1f485a738f6802b42dd39437618b18bbae.tar.gz rust-58a37a1f485a738f6802b42dd39437618b18bbae.zip | |
libstd: Fix merge fallout.
Diffstat (limited to 'src/libstd/priority_queue.rs')
| -rw-r--r-- | src/libstd/priority_queue.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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; |