---

yaml
---
r: 42367
b: refs/heads/master
c: 52cf61f
h: refs/heads/master
i:
  42365: ddf64a4
  42363: 75f82f0
  42359: 41d59a8
  42351: ca6c907
  42335: 8173a8e
  42303: 1bd9792
  42239: 3a72b48
v: v3

Author: jld

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d903231f1e7d7efb35405bdfdcbc451385e429b2
+refs/heads/master: 52cf61fd3bf928de5ca56957e5e1a2dc88d10848
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/trans/consts.rs

@@ -470,7 +470,12 @@ pub fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
 
                 // FIXME (#1645): enum body alignment is generaly wrong.
                 if !degen {
-                    C_packed_struct(~[discrim, c_args])
+                    // A packed_struct has an alignment of 1; thus,
+                    // wrapping one around c_args will misalign it the
+                    // same way we normally misalign enum bodies
+                    // without affecting its internal alignment or
+                    // changing the alignment of the enum.
+                    C_struct(~[discrim, C_packed_struct(~[c_args])])
                 } else if size == 0 {
                     C_struct(~[discrim])
                 } else {

trunk/src/libstd/priority_queue.rs

@@ -12,7 +12,6 @@
 
 use core::container::{Container, Mutable};
 use core::cmp::Ord;
-use core::iter::BaseIter;
 use core::prelude::*;
 use core::ptr::addr_of;
 use core::vec;
@@ -27,14 +26,6 @@ pub struct PriorityQueue<T> {
     priv data: ~[T],
 }
 
-impl <T: Ord> PriorityQueue<T>: BaseIter<T> {
-    /// Visit all values in the underlying vector.
-    ///
-    /// The values are **not** visited in order.
-    pure fn each(&self, f: fn(&T) -> bool) { self.data.each(f) }
-    pure fn size_hint(&self) -> Option<uint> { self.data.size_hint() }
-}
-
 impl <T: Ord> PriorityQueue<T>: Container {
     /// Returns the length of the queue
     pure fn len(&self) -> uint { self.data.len() }