---

yaml
---
r: 275110
b: refs/heads/stable
c: 80122b2
h: refs/heads/master

Author: bors

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 6e985934bdd29579b7df5ad092f44d41ed2cf799
+refs/heads/stable: 80122b2248a6168f38fdb8b532e0cdf5f6c01ba8
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/.gitmodules

@@ -16,4 +16,4 @@
 	url = https://github.com/rust-lang/rust-installer.git
 [submodule "src/liblibc"]
 	path = src/liblibc
-	url = https://github.com/rust-lang-nursery/libc.git
+	url = https://github.com/rust-lang/libc.git

branches/stable/src/libcore/ptr.rs

@@ -161,6 +161,54 @@ pub unsafe fn write<T>(dst: *mut T, src: T) {
     intrinsics::move_val_init(&mut *dst, src)
 }
 
+/// Performs a volatile read of the value from `src` without moving it. This
+/// leaves the memory in `src` unchanged.
+///
+/// Volatile operations are intended to act on I/O memory, and are guaranteed
+/// to not be elided or reordered by the compiler across other volatile
+/// operations. See the LLVM documentation on [[volatile]].
+///
+/// [volatile]: http://llvm.org/docs/LangRef.html#volatile-memory-accesses
+///
+/// # Safety
+///
+/// Beyond accepting a raw pointer, this is unsafe because it semantically
+/// moves the value out of `src` without preventing further usage of `src`.
+/// If `T` is not `Copy`, then care must be taken to ensure that the value at
+/// `src` is not used before the data is overwritten again (e.g. with `write`,
+/// `zero_memory`, or `copy_memory`). Note that `*src = foo` counts as a use
+/// because it will attempt to drop the value previously at `*src`.
+#[inline]
+#[unstable(feature = "volatile", reason = "recently added", issue = "31756")]
+pub unsafe fn read_volatile<T>(src: *const T) -> T {
+    intrinsics::volatile_load(src)
+}
+
+/// Performs a volatile write of a memory location with the given value without
+/// reading or dropping the old value.
+///
+/// Volatile operations are intended to act on I/O memory, and are guaranteed
+/// to not be elided or reordered by the compiler across other volatile
+/// operations. See the LLVM documentation on [[volatile]].
+///
+/// [volatile]: http://llvm.org/docs/LangRef.html#volatile-memory-accesses
+///
+/// # Safety
+///
+/// This operation is marked unsafe because it accepts a raw pointer.
+///
+/// It does not drop the contents of `dst`. This is safe, but it could leak
+/// allocations or resources, so care must be taken not to overwrite an object
+/// that should be dropped.
+///
+/// This is appropriate for initializing uninitialized memory, or overwriting
+/// memory that has previously been `read` from.
+#[inline]
+#[unstable(feature = "volatile", reason = "recently added", issue = "31756")]
+pub unsafe fn write_volatile<T>(dst: *mut T, src: T) {
+    intrinsics::volatile_store(dst, src);
+}
+
 #[lang = "const_ptr"]
 impl<T: ?Sized> *const T {
     /// Returns true if the pointer is null.

branches/stable/src/librustc/lint/builtin.rs

@@ -132,7 +132,7 @@ declare_lint! {
 
 declare_lint! {
     pub MATCH_OF_UNIT_VARIANT_VIA_PAREN_DOTDOT,
-    Warn,
+    Deny,
     "unit struct or enum variant erroneously allowed to match via path::ident(..)"
 }
 

branches/stable/src/llvm

@@ -1 +1 @@
-Subproject commit 39e8e59056bcd84bf9c44d0bcd46ae441567e0a0
+Subproject commit 69ef168544e4f15b793dd35d272008fde9a6e835

branches/stable/src/rustllvm/llvm-auto-clean-trigger

@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2016-02-16
+2016-02-20

branches/stable/src/test/compile-fail/empty-struct-unit-pat.rs

@@ -12,7 +12,6 @@
 
 // aux-build:empty-struct.rs
 
-#![feature(rustc_attrs)]
 // remove prior feature after warning cycle and promoting warnings to errors
 #![feature(braced_empty_structs)]
 
@@ -26,8 +25,7 @@ enum E {
 }
 
 // remove attribute after warning cycle and promoting warnings to errors
-#[rustc_error]
-fn main() { //~ ERROR: compilation successful
+fn main() {
     let e2 = Empty2;
     let e4 = E::Empty4;
     let xe2 = XEmpty2;
@@ -41,12 +39,12 @@ fn main() { //~ ERROR: compilation successful
     //     XEmpty2() => () // ERROR `XEmpty2` does not name a tuple variant or a tuple struct
     // }
     match e2 {
-        Empty2(..) => () //~ WARN `Empty2` does not name a tuple variant or a tuple struct
-            //~^ WARN hard error
+        Empty2(..) => () //~ ERROR `Empty2` does not name a tuple variant or a tuple struct
+            //~^ ERROR hard error
     }
     match xe2 {
-        XEmpty2(..) => () //~ WARN `XEmpty2` does not name a tuple variant or a tuple struct
-            //~^ WARN hard error
+        XEmpty2(..) => () //~ ERROR `XEmpty2` does not name a tuple variant or a tuple struct
+            //~^ ERROR hard error
     }
     // Rejected by parser as yet
     // match e4 {
@@ -57,12 +55,12 @@ fn main() { //~ ERROR: compilation successful
     //     _ => {},
     // }
     match e4 {
-        E::Empty4(..) => () //~ WARN `E::Empty4` does not name a tuple variant or a tuple struct
-            //~^ WARN hard error
+        E::Empty4(..) => () //~ ERROR `E::Empty4` does not name a tuple variant or a tuple struct
+            //~^ ERROR hard error
     }
     match xe4 {
-        XE::XEmpty4(..) => (), //~ WARN `XE::XEmpty4` does not name a tuple variant or a tuple
-            //~^ WARN hard error
+        XE::XEmpty4(..) => (), //~ ERROR `XE::XEmpty4` does not name a tuple variant or a tuple
+            //~^ ERROR hard error
         _ => {},
     }
 }

branches/stable/src/test/run-make/volatile-intrinsics/main.rs

@@ -8,14 +8,20 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(core_intrinsics)]
+#![feature(core_intrinsics, volatile)]
 
 use std::intrinsics::{volatile_load, volatile_store};
+use std::ptr::{read_volatile, write_volatile};
 
 pub fn main() {
     unsafe {
         let mut i : isize = 1;
         volatile_store(&mut i, 2);
         assert_eq!(volatile_load(&i), 2);
     }
+    unsafe {
+        let mut i : isize = 1;
+        write_volatile(&mut i, 2);
+        assert_eq!(read_volatile(&i), 2);
+    }
 }

branches/stable/src/test/run-pass/issue-pr29383.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![allow(match_of_unit_variant_via_paren_dotdot)]
+
 enum E {
     A,
     B,