---

yaml
---
r: 81567
b: refs/heads/snap-stage3
c: 0bad7e1
h: refs/heads/master
i:
  81565: 91db617
  81563: f07758a
  81559: 8a12344
  81551: 1fa57ea
  81535: e477cbc
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 95609699e3796f4911dc433e5a6edbe17847b0e1
+refs/heads/snap-stage3: 0bad7e1a37c21668ff4f4d4f4b629218b9f47538
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/adt.rs

@@ -505,12 +505,7 @@ pub fn trans_const(ccx: &mut CrateContext, r: &Repr, discr: Disr,
         }
         Univariant(ref st, _dro) => {
             assert_eq!(discr, 0);
-            let contents = build_const_struct(ccx, st, vals);
-            if st.packed {
-                C_packed_struct(contents)
-            } else {
-                C_struct(contents)
-            }
+            C_struct(build_const_struct(ccx, st, vals))
         }
         General(ref cases) => {
             let case = &cases[discr];

branches/snap-stage3/src/libstd/vec.rs

@@ -840,6 +840,7 @@ pub trait ImmutableVector<'self, T> {
     fn window_iter(self, size: uint) -> WindowIter<'self, T>;
     fn chunk_iter(self, size: uint) -> ChunkIter<'self, T>;
 
+    fn get_opt(&self, index: uint) -> Option<&'self T>;
     fn head(&self) -> &'self T;
     fn head_opt(&self) -> Option<&'self T>;
     fn tail(&self) -> &'self [T];
@@ -1019,6 +1020,13 @@ impl<'self,T> ImmutableVector<'self, T> for &'self [T] {
         ChunkIter { v: self, size: size }
     }
 
+    /// Returns the element of a vector at the given index, or `None` if the
+    /// index is out of bounds
+    #[inline]
+    fn get_opt(&self, index: uint) -> Option<&'self T> {
+        if index < self.len() { Some(&self[index]) } else { None }
+    }
+
     /// Returns the first element of a vector, failing if the vector is empty.
     #[inline]
     fn head(&self) -> &'self T {
@@ -2574,6 +2582,16 @@ mod tests {
         assert_eq!(v2.len(), 2);
     }
 
+    #[test]
+    fn test_get_opt() {
+        let mut a = ~[11];
+        assert_eq!(a.get_opt(1), None);
+        a = ~[11, 12];
+        assert_eq!(a.get_opt(1).unwrap(), &12);
+        a = ~[11, 12, 13];
+        assert_eq!(a.get_opt(1).unwrap(), &12);
+    }
+
     #[test]
     fn test_head() {
         let mut a = ~[11];

branches/snap-stage3/src/test/run-pass/packed-struct-size.rs

@@ -50,11 +50,6 @@ struct S7_Option {
     d: Option<@mut f64>
 }
 
-// Placing packed structs in statics should work
-static TEST_S4: S4 = S4 { a: 1, b: [2, 3, 4] };
-static TEST_S5: S5 = S5 { a: 3, b: 67 };
-static TEST_S3_Foo: S3_Foo = S3_Foo { a: 1, b: 2, c: Baz };
-
 
 pub fn main() {
     assert_eq!(sys::size_of::<S4>(), 4);