---

yaml
---
r: 234875
b: refs/heads/stable
c: e0283ab
h: refs/heads/master
i:
  234873: 38087e5
  234871: ea0e296
v: v3

Author: semarie

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 43ad8d0beca33b9a2a8f64f30b71724e0b213bd4
+refs/heads/stable: e0283ab9c4d33005ec987851bfb35b8b65af611a
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/configure

@@ -920,7 +920,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[5-6]*)
+        (3.[5-7]*)
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)

branches/stable/mk/main.mk

@@ -13,7 +13,7 @@
 ######################################################################
 
 # The version number
-CFG_RELEASE_NUM=1.3.0
+CFG_RELEASE_NUM=1.2.0
 
 # An optional number to put after the label, e.g. '.2' -> '-beta.2'
 # NB Make sure it starts with a dot to conform to semver pre-release

branches/stable/src/doc/style/features/traits/generics.md

@@ -29,7 +29,7 @@ explicitly implement to be used by this generic function.
   explicit conversions or other method calls would usually be necessary. See the
   [overloading/implicits use case](#use-case:-limited-overloading-and/or-implicit-conversions)
   below.
-* _Precise types_. Because generics give a _name_ to the specific type
+* _Precise types_. Because generic give a _name_ to the specific type
   implementing a trait, it is possible to be precise about places where that
   exact type is required or produced. For example, a function
 

branches/stable/src/doc/trpl/academic-research.md

@@ -42,32 +42,5 @@ Recommended for inspiration and a better understanding of Rust's background.
 
 ### Papers *about* Rust
 
-* [GPU Programming in Rust: Implementing High Level Abstractions in a
-Systems Level
-Language](http://www.cs.indiana.edu/~eholk/papers/hips2013.pdf). Early GPU work by Eric Holk.
-* [Parallel closures: a new twist on an old
-  idea](https://www.usenix.org/conference/hotpar12/parallel-closures-new-twist-old-idea)
-  - not exactly about rust, but by nmatsakis
-* [Patina: A Formalization of the Rust Programming
-  Language](ftp://ftp.cs.washington.edu/tr/2015/03/UW-CSE-15-03-02.pdf). Early
-  formalization of a subset of the type system, by Eric Reed.
-* [Experience Report: Developing the Servo Web Browser Engine using
-  Rust](http://arxiv.org/abs/1505.07383). By Lars Bergstrom.
-* [Implementing a Generic Radix Trie in
-  Rust](https://michaelsproul.github.io/rust_radix_paper/rust-radix-sproul.pdf). Undergrad
-  paper by Michael Sproul.
-* [Reenix: Implementing a Unix-Like Operating System in
-  Rust](http://scialex.github.io/reenix.pdf). Undergrad paper by Alex
-  Light.
-* [Evaluation of performance and productivity metrics of potential
-  programming languages in the HPC environment](). Bachelor's thesis by
-  Florian Wilkens. Compares C, Go and Rust.
-* [Nom, a byte oriented, streaming, zero copy, parser combinators library
-  in Rust](http://spw15.langsec.org/papers/couprie-nom.pdf). By
-  Geoffroy Couprie, research for VLC.
-* [Graph-Based Higher-Order Intermediate
-  Representation](http://compilers.cs.uni-saarland.de/papers/lkh15_cgo.pdf). An
-  experimental IR implemented in Impala, a Rust-like language.
-* [Code Refinement of Stencil
-  Codes](http://compilers.cs.uni-saarland.de/papers/ppl14_web.pdf). Another
-  paper using Impala.
+* [GPU programming in Rust](http://www.cs.indiana.edu/~eholk/papers/hips2013.pdf)
+* [Parallel closures: a new twist on an old idea](https://www.usenix.org/conference/hotpar12/parallel-closures-new-twist-old-idea) - not exactly about rust, but by nmatsakis

branches/stable/src/doc/trpl/installing-rust.md

@@ -41,8 +41,6 @@ $ sudo /usr/local/lib/rustlib/uninstall.sh
 If you used the Windows installer, just re-run the `.msi` and it will give you
 an uninstall option.
 
-## That disclaimer we promised
-
 Some people, and somewhat rightfully so, get very upset when we tell you to
 `curl | sh`. Basically, when you do this, you are trusting that the good
 people who maintain Rust aren't going to hack your computer and do bad things.
@@ -52,8 +50,6 @@ binary downloads][install-page].
 
 [from-source]: https://github.com/rust-lang/rust#building-from-source
 
-## Platform support
-
 Oh, we should also mention the officially supported platforms:
 
 * Windows (7, 8, Server 2008 R2)
@@ -70,8 +66,6 @@ integrated as the Linux/OS X experience is. We're working on it! If anything
 does not work, it is a bug. Please let us know if that happens. Each and every
 commit is tested against Windows just like any other platform.
 
-## After installation
-
 If you've got Rust installed, you can open up a shell, and type this:
 
 ```bash

branches/stable/src/librustc_typeck/diagnostics.rs

@@ -380,22 +380,6 @@ fn main() {
 ```
 "##,
 
-E0044: r##"
-You can't use type parameters on foreign items. Example of erroneous code:
-
-```
-extern { fn some_func<T>(x: T); }
-```
-
-To fix this, replace the type parameter with the specializations that you
-need:
-
-```
-extern { fn some_func_i32(x: i32); }
-extern { fn some_func_i64(x: i64); }
-```
-"##,
-
 E0045: r##"
 Rust only supports variadic parameters for interoperability with C code in its
 FFI. As such, variadic parameters can only be used with functions which are
@@ -749,44 +733,6 @@ fn some_func(x: &mut i32) {
 ```
 "##,
 
-E0071: r##"
-You tried to use a structure initialization with a non-structure type.
-Example of erroneous code:
-
-```
-enum Foo { FirstValue };
-
-let u = Foo::FirstValue { value: 0i32 }; // error: Foo::FirstValue
-                                         // isn't a structure!
-// or even simpler, if the structure wasn't defined at all:
-let u = RandomName { random_field: 0i32 }; // error: RandomName
-                                           // isn't a structure!
-```
-
-To fix this, please check:
- * Did you spell it right?
- * Did you accidentaly used an enum as a struct?
- * Did you accidentaly make an enum when you intended to use a struct?
-
-Here is the previous code with all missing information:
-
-```
-struct Inner {
-    value: i32
-}
-
-enum Foo {
-    FirstValue(Inner)
-}
-
-fn main() {
-    let u = Foo::FirstValue(Inner { value: 0i32 });
-
-    let t = Inner { value: 0i32 };
-}
-```
-"##,
-
 E0072: r##"
 When defining a recursive struct or enum, any use of the type being defined
 from inside the definition must occur behind a pointer (like `Box` or `&`).
@@ -1542,7 +1488,9 @@ For more information see the [opt-in builtin traits RFC](https://github.com/rust
 }
 
 register_diagnostics! {
+    E0044, // foreign items may not have type parameters
     E0068,
+    E0071,
     E0074,
     E0075,
     E0076,

branches/stable/src/test/compile-fail/issue-23305.rs

@@ -11,7 +11,6 @@
 // Tests parallel codegen - this can fail if the symbol for the anonymous
 // closure in `sum` pollutes the second codegen unit from the first.
 
-// ignore-bitrig
 // compile-flags: -C codegen_units=2
 
 #![feature(core)]