---

yaml
---
r: 138171
b: refs/heads/try
c: 5c05f90
h: refs/heads/master
i:
  138169: b35e107
  138167: 4a0a413
v: v3

Author: Julian Orth

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b6e0d3a5bf4c88650a22f605f822e02c6b163580
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
-refs/heads/try: 126f224d9aee9779e5270eea4d8992b04855c307
+refs/heads/try: 5c05f900bf56c6ddfae16c624d480e9ffa41ae9e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcollections/slice.rs

@@ -101,6 +101,7 @@ use vec::Vec;
 
 pub use core::slice::{Chunks, AsSlice, ImmutableSlice, ImmutablePartialEqSlice};
 pub use core::slice::{ImmutableOrdSlice, MutableSlice, Items, MutItems};
+pub use core::slice::{ImmutableIntSlice, MutableIntSlice};
 pub use core::slice::{MutSplits, MutChunks, Splits};
 pub use core::slice::{bytes, mut_ref_slice, ref_slice, MutableCloneableSlice};
 pub use core::slice::{Found, NotFound};

branches/try/src/libcollections/vec.rs

@@ -453,13 +453,13 @@ impl<T> Index<uint,T> for Vec<T> {
     }
 }
 
-#[cfg(not(stage0))]
-impl<T> IndexMut<uint,T> for Vec<T> {
+// FIXME(#12825) Indexing will always try IndexMut first and that causes issues.
+/*impl<T> IndexMut<uint,T> for Vec<T> {
     #[inline]
     fn index_mut<'a>(&'a mut self, index: &uint) -> &'a mut T {
         self.get_mut(*index)
     }
-}
+}*/
 
 impl<T> ops::Slice<uint, [T]> for Vec<T> {
     #[inline]
@@ -2154,6 +2154,7 @@ impl<T> Vec<T> {
     }
 }
 
+
 #[cfg(test)]
 mod tests {
     extern crate test;

branches/try/src/librustc/lib.rs

@@ -29,9 +29,12 @@ This API is completely unstable and subject to change.
       html_root_url = "http://doc.rust-lang.org/nightly/")]
 
 #![allow(deprecated)]
-#![feature(default_type_params, globs, if_let, import_shadowing, macro_rules, phase, quote)]
-#![feature(slicing_syntax, struct_variant, unsafe_destructor)]
+#![allow(unknown_features)]
+#![feature(macro_rules, globs, struct_variant, quote)]
+#![feature(default_type_params, phase, unsafe_destructor, slicing_syntax)]
+
 #![feature(rustc_diagnostic_macros)]
+#![feature(import_shadowing)]
 
 extern crate arena;
 extern crate debug;