---

yaml
---
r: 128861
b: refs/heads/try
c: ab65869
h: refs/heads/master
i:
  128859: 62b88fa
v: v3

Author: lilyball

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 07d86b46a949a94223da714e35b343243e4ecce4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
-refs/heads/try: cf71f1c7b077c93b33360fd5af6442fff2e39876
+refs/heads/try: ab65869c9d67bdc9d7ca9e7c80bb9a4460f1029e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/vim/ftplugin/rust.vim

@@ -56,6 +56,16 @@ if exists("g:loaded_delimitMate")
 	let b:delimitMate_excluded_regions = delimitMate#Get("excluded_regions") . ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 endif
 
+if has("folding") && exists('g:rust_fold') && g:rust_fold != 0
+	let b:rust_set_foldmethod=1
+	setlocal foldmethod=syntax
+	if g:rust_fold == 2
+		setlocal foldlevel<
+	else
+		setlocal foldlevel=99
+	endif
+endif
+
 if has('conceal') && exists('g:rust_conceal')
 	let b:rust_set_conceallevel=1
 	setlocal conceallevel=2
@@ -108,6 +118,10 @@ let b:undo_ftplugin = "
 		\|else
 		  \|unlet! b:delimitMate_excluded_regions
 		\|endif
+		\|if exists('b:rust_set_foldmethod')
+		  \|setlocal foldmethod< foldlevel<
+		  \|unlet b:rust_set_foldmethod
+		\|endif
 		\|if exists('b:rust_set_conceallevel')
 		  \|setlocal conceallevel<
 		  \|unlet b:rust_set_conceallevel

branches/try/src/etc/vim/syntax/rust.vim

@@ -11,17 +11,6 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-" Fold settings {{{1
-
-if has("folding") && exists('g:rust_fold') && g:rust_fold != 0
-  setlocal foldmethod=syntax
-  if g:rust_fold == 2
-    setlocal foldlevel<
-  else
-    setlocal foldlevel=99
-  endif
-endif
-
 " Syntax definitions {{{1
 " Basic keywords {{{2
 syn keyword   rustConditional match if else

branches/try/src/libnum/complex.rs

@@ -257,14 +257,6 @@ mod test {
         assert_eq!(_1_0i.inv(), _1_0i.inv());
     }
 
-    #[test]
-    #[should_fail]
-    fn test_divide_by_zero_natural() {
-        let n = Complex::new(2i, 3i);
-        let d = Complex::new(0, 0);
-        let _x = n / d;
-    }
-
     #[test]
     #[should_fail]
     #[ignore]

branches/try/src/librustc/middle/trans/base.rs

@@ -2278,7 +2278,7 @@ pub fn get_fn_llvm_attributes(ccx: &CrateContext, fn_ty: ty::t)
         match ty::get(ret_ty).sty {
             // `~` pointer return values never alias because ownership
             // is transferred
-            ty::ty_uniq(it) if match ty::get(it).sty {
+            ty::ty_uniq(it)  if match ty::get(it).sty {
                 ty::ty_str | ty::ty_vec(..) | ty::ty_trait(..) => true, _ => false
             } => {}
             ty::ty_uniq(_) => {
@@ -2354,21 +2354,15 @@ pub fn get_fn_llvm_attributes(ccx: &CrateContext, fn_ty: ty::t)
             }
 
             // `&mut` pointer parameters never alias other parameters, or mutable global data
-            //
-            // `&T` where `T` contains no `UnsafeCell<U>` is immutable, and can be marked as both
-            // `readonly` and `noalias`, as LLVM's definition of `noalias` is based solely on
-            // memory dependencies rather than pointer equality
+            // `&` pointer parameters never alias either (for LLVM's purposes) as long as the
+            // interior is safe
             ty::ty_rptr(b, mt) if mt.mutbl == ast::MutMutable ||
                                   !ty::type_contents(ccx.tcx(), mt.ty).interior_unsafe() => {
 
                 let llsz = llsize_of_real(ccx, type_of::type_of(ccx, mt.ty));
                 attrs.arg(idx, llvm::NoAliasAttribute)
                      .arg(idx, llvm::DereferenceableAttribute(llsz));
 
-                if mt.mutbl == ast::MutImmutable {
-                    attrs.arg(idx, llvm::ReadOnlyAttribute);
-                }
-
                 match b {
                     ReLateBound(_, BrAnon(_)) => {
                         attrs.arg(idx, llvm::NoCaptureAttribute);

branches/try/src/librustc/middle/trans/controlflow.rs

@@ -330,12 +330,13 @@ pub fn trans_for<'a>(
     // Check the discriminant; if the `None` case, exit the loop.
     let option_representation = adt::represent_type(loopback_bcx_out.ccx(),
                                                     method_result_type);
+    let i8_type = Type::i8(loopback_bcx_out.ccx());
     let lldiscriminant = adt::trans_get_discr(loopback_bcx_out,
                                               &*option_representation,
                                               option_datum.val,
-                                              None);
-    let i1_type = Type::i1(loopback_bcx_out.ccx());
-    let llcondition = Trunc(loopback_bcx_out, lldiscriminant, i1_type);
+                                              Some(i8_type));
+    let llzero = C_u8(loopback_bcx_out.ccx(), 0);
+    let llcondition = ICmp(loopback_bcx_out, IntNE, lldiscriminant, llzero);
     CondBr(loopback_bcx_out, llcondition, body_bcx_in.llbb, cleanup_llbb);
 
     // Now we're in the body. Unpack the `Option` value into the programmer-

branches/try/src/librustc/middle/trans/glue.rs

@@ -250,9 +250,8 @@ fn trans_struct_drop<'a>(bcx: &'a Block<'a>,
         let args = vec!(self_arg);
 
         // Add all the fields as a value which needs to be cleaned at the end of
-        // this scope. Iterate in reverse order so a Drop impl doesn't reverse
-        // the order in which fields get dropped.
-        for (i, ty) in st.fields.iter().enumerate().rev() {
+        // this scope.
+        for (i, ty) in st.fields.iter().enumerate() {
             let llfld_a = adt::struct_field_ptr(variant_cx, &*st, value, i, false);
             variant_cx.fcx.schedule_drop_mem(cleanup::CustomScope(field_scope),
                                              llfld_a, *ty);

branches/try/src/libstd/io/util.rs

@@ -48,12 +48,10 @@ impl<R: Reader> Reader for LimitReader<R> {
         }
 
         let len = cmp::min(self.limit, buf.len());
-        let res = self.inner.read(buf.mut_slice_to(len));
-        match res {
-            Ok(len) => self.limit -= len,
-            _ => {}
-        }
-        res
+        self.inner.read(buf.mut_slice_to(len)).map(|len| {
+            self.limit -= len;
+            len
+        })
     }
 }
 
@@ -69,8 +67,6 @@ impl<R: Buffer> Buffer for LimitReader<R> {
     }
 
     fn consume(&mut self, amt: uint) {
-        // Don't let callers reset the limit by passing an overlarge value
-        let amt = cmp::min(amt, self.limit);
         self.limit -= amt;
         self.inner.consume(amt);
     }
@@ -101,7 +97,6 @@ impl Buffer for ZeroReader {
         static DATA: [u8, ..64] = [0, ..64];
         Ok(DATA.as_slice())
     }
-
     fn consume(&mut self, _amt: uint) {}
 }
 
@@ -122,10 +117,7 @@ impl Buffer for NullReader {
     fn consume(&mut self, _amt: uint) {}
 }
 
-/// A `Writer` which multiplexes writes to a set of `Writer`s.
-///
-/// The `Writer`s are delegated to in order. If any `Writer` returns an error,
-/// that error is returned immediately and remaining `Writer`s are not called.
+/// A `Writer` which multiplexes writes to a set of `Writers`.
 pub struct MultiWriter {
     writers: Vec<Box<Writer>>
 }
@@ -140,22 +132,24 @@ impl MultiWriter {
 impl Writer for MultiWriter {
     #[inline]
     fn write(&mut self, buf: &[u8]) -> io::IoResult<()> {
+        let mut ret = Ok(());
         for writer in self.writers.mut_iter() {
-            try!(writer.write(buf));
+            ret = ret.and(writer.write(buf));
         }
-        Ok(())
+        return ret;
     }
 
     #[inline]
     fn flush(&mut self) -> io::IoResult<()> {
+        let mut ret = Ok(());
         for writer in self.writers.mut_iter() {
-            try!(writer.flush());
+            ret = ret.and(writer.flush());
         }
-        Ok(())
+        return ret;
     }
 }
 
-/// A `Reader` which chains input from multiple `Reader`s, reading each to
+/// A `Reader` which chains input from multiple `Readers`, reading each to
 /// completion before moving onto the next.
 pub struct ChainedReader<I, R> {
     readers: I,
@@ -235,16 +229,17 @@ pub fn copy<R: Reader, W: Writer>(r: &mut R, w: &mut W) -> io::IoResult<()> {
     }
 }
 
-/// An adaptor converting an `Iterator<u8>` to a `Reader`.
+/// A `Reader` which converts an `Iterator<u8>` into a `Reader`.
 pub struct IterReader<T> {
     iter: T,
 }
 
 impl<T: Iterator<u8>> IterReader<T> {
-    /// Creates a new `IterReader` which will read from the specified
-    /// `Iterator`.
+    /// Create a new `IterReader` which will read from the specified `Iterator`.
     pub fn new(iter: T) -> IterReader<T> {
-        IterReader { iter: iter }
+        IterReader {
+            iter: iter,
+        }
     }
 }
 
@@ -256,7 +251,7 @@ impl<T: Iterator<u8>> Reader for IterReader<T> {
             *slot = elt;
             len += 1;
         }
-        if len == 0 && buf.len() != 0 {
+        if len == 0 {
             Err(io::standard_error(io::EndOfFile))
         } else {
             Ok(len)
@@ -302,14 +297,6 @@ mod test {
         assert_eq!(0, r.limit());
     }
 
-    #[test]
-    fn test_limit_reader_overlong_consume() {
-        let mut r = MemReader::new(vec![0, 1, 2, 3, 4, 5]);
-        let mut r = LimitReader::new(r.by_ref(), 1);
-        r.consume(2);
-        assert_eq!(vec![], r.read_to_end().unwrap());
-    }
-
     #[test]
     fn test_null_writer() {
         let mut s = NullWriter;
@@ -428,11 +415,4 @@ mod test {
 
         assert_eq!(r.read(buf).unwrap_err().kind, io::EndOfFile);
     }
-
-    #[test]
-    fn iter_reader_zero_length() {
-        let mut r = IterReader::new(range(0u8, 8));
-        let mut buf = [];
-        assert_eq!(Ok(0), r.read(buf));
-    }
 }

branches/try/src/libstd/time/duration.rs

@@ -38,7 +38,7 @@ macro_rules! try_opt(
 // FIXME #16466: This could be represented as (i64 seconds, u32 nanos)
 /// ISO 8601 time duration with nanosecond precision.
 /// This also allows for the negative duration; see individual methods for details.
-#[deriving(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[deriving(PartialEq, Eq, PartialOrd, Ord)]
 pub struct Duration {
     days: i32,
     secs: u32,  // Always < SECS_PER_DAY

branches/try/src/rustllvm/RustWrapper.cpp

@@ -282,11 +282,7 @@ extern "C" LLVMValueRef LLVMDIBuilderCreateSubroutineType(
     LLVMValueRef ParameterTypes) {
     return wrap(Builder->createSubroutineType(
         unwrapDI<DIFile>(File),
-#if LLVM_VERSION_MINOR >= 6
         unwrapDI<DITypeArray>(ParameterTypes)));
-#else
-        unwrapDI<DIArray>(ParameterTypes)));
-#endif
 }
 
 extern "C" LLVMValueRef LLVMDIBuilderCreateFunction(
@@ -638,11 +634,7 @@ extern "C" void LLVMDICompositeTypeSetTypeArray(
     LLVMValueRef CompositeType,
     LLVMValueRef TypeArray)
 {
-#if LLVM_VERSION_MINOR >= 6
     unwrapDI<DICompositeType>(CompositeType).setArrays(unwrapDI<DIArray>(TypeArray));
-#else
-    unwrapDI<DICompositeType>(CompositeType).setTypeArray(unwrapDI<DIArray>(TypeArray));
-#endif
 }
 
 extern "C" char *LLVMTypeToString(LLVMTypeRef Type) {