---

jooert · jooert · commit 6a6c8acf81a3 · 2015-06-24T12:08:57.000+02:00
yaml --- r: 227814 b: refs/heads/try c: 239d9c2 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 4757d9bcc41ca59b6d52bd85d57faab0b71802e9
+refs/heads/try: 239d9c2b09e3cd4ecdc1a8756cd1a389b8828baf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try/configure b/branches/try/configure
@@ -899,18 +899,6 @@ then
     fi
 fi
 
-# If the clang isn't already enabled, check for GCC, and if it is missing, turn
-# on clang as a backup.
-if [ -z "$CFG_ENABLE_CLANG" ]
-then
-  CFG_GCC_VERSION=$("$CFG_GCC" --version 2>&1)
-  if [ $? -ne 0 ]
-  then
-    step_msg "GCC not installed, will try using Clang"
-    CFG_ENABLE_CLANG=1
-  fi
-fi
-
 # Okay, at this point, we have made up our minds about whether we are
 # going to force CFG_ENABLE_CLANG or not; save the setting if so.
 if [ ! -z "$CFG_ENABLE_CLANG" ]
@@ -932,7 +920,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[5-7]*)
+        (3.[5-6]*)
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)
diff --git a/branches/try/src/doc/style/features/traits/generics.md b/branches/try/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
 
diff --git a/branches/try/src/doc/trpl/academic-research.md b/branches/try/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
diff --git a/branches/try/src/libcollectionstest/lib.rs b/branches/try/src/libcollectionstest/lib.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![feature(append)]
-#![feature(bit_vec_append_split_off)]
 #![feature(bitset)]
 #![feature(bitvec)]
 #![feature(box_syntax)]
diff --git a/branches/try/src/liblibc/lib.rs b/branches/try/src/liblibc/lib.rs
@@ -3600,11 +3600,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         #[cfg(any(target_arch = "mips",
                   target_arch = "mipsel"))]
@@ -3689,11 +3684,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         #[cfg(any(target_arch = "x86",
                   target_arch = "x86_64",
@@ -4237,11 +4227,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         pub mod extra {
             use types::os::arch::c95::c_int;
@@ -4666,11 +4651,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         pub mod extra {
             use types::os::arch::c95::c_int;
@@ -5112,11 +5092,6 @@ pub mod consts {
             pub const SHUT_RD: c_int = 0;
             pub const SHUT_WR: c_int = 1;
             pub const SHUT_RDWR: c_int = 2;
-
-            pub const LOCK_SH: c_int = 1;
-            pub const LOCK_EX: c_int = 2;
-            pub const LOCK_NB: c_int = 4;
-            pub const LOCK_UN: c_int = 8;
         }
         pub mod extra {
             use types::os::arch::c95::c_int;
@@ -6146,7 +6121,6 @@ pub mod funcs {
                            -> c_int;
             pub fn realpath(pathname: *const c_char, resolved: *mut c_char)
                             -> *mut c_char;
-            pub fn flock(fd: c_int, operation: c_int) -> c_int;
         }
     }
 
@@ -6163,7 +6137,6 @@ pub mod funcs {
                            -> c_int;
             pub fn mincore(addr: *mut c_void, len: size_t, vec: *mut c_uchar)
                            -> c_int;
-            pub fn flock(fd: c_int, operation: c_int) -> c_int;
         }
     }
 
diff --git a/branches/try/src/librustc_typeck/diagnostics.rs b/branches/try/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,
diff --git a/branches/try/src/test/compile-fail/issue-23305.rs b/branches/try/src/test/compile-fail/issue-23305.rs
diff --git a/branches/try/src/test/run-pass/issue-22375.rs b/branches/try/src/test/run-pass/issue-22375.rs
diff --git a/branches/try/src/test/run-pass/parallel-codegen-closures.rs b/branches/try/src/test/run-pass/parallel-codegen-closures.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)]
