---

yaml
---
r: 196338
b: refs/heads/tmp
c: 1081626
h: refs/heads/master
v: v3

Author: mbrubeck

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 9854143cba679834bc4ef932858cd5303f015a0e
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 3e8a773bc51cc276fa53a07980566e816234a6bd
+refs/heads/tmp: 10816266d65ead7645a147ae1fde1b90aeda5d33
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 53a183f0274316596bf9405944d4f0468d8c93e4
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/RELEASES.md

@@ -1,102 +1,3 @@
-Version 1.0.0-beta (April 2015)
--------------------------------------
-
-* ~1100 changes, numerous bugfixes
-
-* Highlights
-
-    * The big news is that the vast majority of the standard library
-      is now `#[stable]` -- 75% of the non-deprecated API surface at
-      last count. Numerous crates are now running on stable
-      Rust. Starting with this release, it is not possible to use
-      unstable features on a stable build.
-    * Arithmetic on basic integer types now
-      [checks for overflow in debug builds][overflow].
-
-* Language
-
-    * [`Send` no longer implies `'static`][send-rfc], which made
-      possible the [`thread::scoped` API][scoped]. Scoped threads can
-      borrow data from their parent's stack frame -- safely!
-    * [UFCS now supports trait-less associated paths][moar-ufcs] like
-      `MyType::default()`.
-    * Primitive types [now have inherent methods][prim-inherent],
-      obviating the need for extension traits like `SliceExt`.
-    * Methods with `Self: Sized` in their `where` clause are
-      [considered object-safe][self-sized], allowing many extension
-      traits like `IteratorExt` to be merged into the traits they
-      extended.
-    * You can now [refer to associated types][assoc-where] whose
-      corresponding trait bounds appear only in a `where` clause.
-    * The final bits of [OIBIT landed][oibit-final], meaning that
-      traits like `Send` and `Sync` are now library-defined.
-    * A [Reflect trait][reflect] was introduced, which means that
-      downcasting via the `Any` trait is effectively limited to
-      concrete types. This helps retain the potentially-important
-      "parametricity" property: generic code cannot behave differently
-      for different type arguments except in minor ways.
-    * The `unsafe_destructor` feature is now deprecated in favor of
-      the [new `dropck`][dropck]. This change is a major reduction in
-      unsafe code.
-    * Trait coherence was [revised again][fundamental], this time with
-      an eye toward API evolution over time.
-
-* Libraries
-
-    * The new path and IO modules are complete and `#[stable]`. This
-      was the major library focus for this cycle.
-    * The path API was [revised][path-normalize] to normalize `.`,
-      adjusting the tradeoffs in favor of the most common usage.
-    * A large number of remaining APIs in `std` were also stabilized
-      during this cycle; about 75% of the non-deprecated API surface
-      is now stable.
-    * The new [string pattern API][string-pattern] landed, which makes
-      the string slice API much more internally consistent and flexible.
-    * A shiny [framework for Debug implementations][debug-builder] landed.
-      This makes it possible to opt in to "pretty-printed" debugging output.
-    * A new set of [generic conversion traits][conversion] replaced
-      many existing ad hoc traits.
-    * Generic numeric traits were
-      [completely removed][num-traits]. This was made possible thanks
-      to inherent methods for primitive types, and the removal gives
-      maximal flexibility for designing a numeric hierarchy in the future.
-    * The `Fn` traits are now related via [inheritance][fn-inherit]
-      and provide ergonomic [blanket implementations][fn-blanket].
-    * The `Index` and `IndexMut` traits were changed to
-      [take the index by value][index-value], enabling code like
-      `hash_map["string"]` to work.
-    * `Copy` now [inherits][copy-clone] from `Clone`, meaning that all
-      `Copy` data is known to be `Clone` as well.
-
-* Infrastructure
-
-    * Metadata was tuned, shrinking binaries [by 27%][metadata-shrink].
-    * Much headway was made on ecosystem-wide CI, making it possible
-      to [compare builds for breakage][ci-compare].
-
-[send-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0458-send-improvements.md
-[scoped]: http://static.rust-lang.org/doc/master/std/thread/fn.scoped.html
-[moar-ufcs]: https://github.com/rust-lang/rust/pull/22172
-[prim-inherent]: https://github.com/rust-lang/rust/pull/23104
-[overflow]: https://github.com/rust-lang/rfcs/blob/master/text/0560-integer-overflow.md
-[metadata-shrink]: https://github.com/rust-lang/rust/pull/22971
-[self-sized]: https://github.com/rust-lang/rust/pull/22301
-[assoc-where]: https://github.com/rust-lang/rust/pull/22512
-[string-pattern]: https://github.com/rust-lang/rust/pull/22466
-[oibit-final]: https://github.com/rust-lang/rust/pull/21689
-[reflect]: https://github.com/rust-lang/rust/pull/23712
-[debug-builder]: https://github.com/rust-lang/rfcs/blob/master/text/0640-debug-improvements.md
-[conversion]: https://github.com/rust-lang/rfcs/pull/529
-[num-traits]: https://github.com/rust-lang/rust/pull/23549
-[index-value]: https://github.com/rust-lang/rust/pull/23601
-[dropck]: https://github.com/rust-lang/rfcs/pull/769
-[fundamental]: https://github.com/rust-lang/rfcs/pull/1023
-[ci-compare]: https://gist.github.com/brson/a30a77836fbec057cbee
-[fn-inherit]: https://github.com/rust-lang/rust/pull/23282
-[fn-blanket]: https://github.com/rust-lang/rust/pull/23895
-[copy-clone]: https://github.com/rust-lang/rust/pull/23860
-[path-normalize]: https://github.com/rust-lang/rust/pull/23229
-
 Version 1.0.0-alpha.2 (February 2015)
 -------------------------------------
 

branches/tmp/mk/crates.mk

@@ -125,18 +125,13 @@ ONLY_RLIB_rustc_bitflags := 1
 # On channels where the only usable crate is std, only build documentation for
 # std. This keeps distributions small and doesn't clutter up the API docs with
 # confusing internal details from the crates behind the facade.
-#
-# (Disabled while cmr figures out how to change rustdoc to make reexports work
-# slightly nicer. Otherwise, all cross-crate links to Vec will go to
-# libcollections, breaking them, and [src] links for anything reexported will
-# not work.)
 
-#ifeq ($(CFG_RELEASE_CHANNEL),stable)
-#DOC_CRATES := std
-#else
-#ifeq ($(CFG_RELEASE_CHANNEL),beta)
-#DOC_CRATES := std
-#else
+ifeq ($(CFG_RELEASE_CHANNEL),stable)
+DOC_CRATES := std
+else
+ifeq ($(CFG_RELEASE_CHANNEL),beta)
+DOC_CRATES := std
+else
 DOC_CRATES := $(filter-out rustc, \
 	   $(filter-out rustc_trans, \
 	   $(filter-out rustc_typeck, \
@@ -148,8 +143,8 @@ DOC_CRATES := $(filter-out rustc, \
 	   $(filter-out log, \
 	   $(filter-out getopts, \
 	   $(filter-out syntax, $(CRATES))))))))))))
-#endif
-#endif
+endif
+endif
 COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_resolve \
                        rustc_typeck rustc_driver syntax rustc_privacy \
                        rustc_lint

branches/tmp/mk/tests.mk

@@ -166,7 +166,7 @@ $(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
 ######################################################################
 
 # The main testing target. Tests lots of stuff.
-check: check-sanitycheck cleantmptestlogs cleantestlibs all check-stage2 tidy
+check: cleantmptestlogs cleantestlibs all check-stage2 tidy
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
 # As above but don't bother running tidy.
@@ -193,11 +193,6 @@ check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
 # Not run as part of the normal test suite, but tested by bors on checkin.
 check-secondary: check-build-compiletest check-build-lexer-verifier check-lexer check-pretty
 
-.PHONY: check-sanitycheck
-
-check-sanitycheck:
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-sanitycheck.py
-
 # check + check-secondary.
 #
 # Issue #17883: build check-secondary first so hidden dependencies in

branches/tmp/src/compiletest/compiletest.rs

@@ -18,6 +18,7 @@
 #![feature(std_misc)]
 #![feature(test)]
 #![feature(path_ext)]
+#![feature(convert)]
 #![feature(str_char)]
 
 #![deny(warnings)]
@@ -31,6 +32,7 @@ extern crate log;
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
+use std::thunk::Thunk;
 use getopts::{optopt, optflag, reqopt};
 use common::Config;
 use common::{Pretty, DebugInfoGdb, DebugInfoLldb, Codegen};
@@ -350,7 +352,7 @@ pub fn make_test_name(config: &Config, testfile: &Path) -> test::TestName {
 pub fn make_test_closure(config: &Config, testfile: &Path) -> test::TestFn {
     let config = (*config).clone();
     let testfile = testfile.to_path_buf();
-    test::DynTestFn(Box::new(move || {
+    test::DynTestFn(Thunk::new(move || {
         runtest::run(config, &testfile)
     }))
 }

branches/tmp/src/compiletest/header.rs

@@ -311,7 +311,7 @@ fn parse_exec_env(line: &str) -> Option<(String, String)> {
     parse_name_value_directive(line, "exec-env").map(|nv| {
         // nv is either FOO or FOO=BAR
         let mut strs: Vec<String> = nv
-                                      .splitn(2, '=')
+                                      .splitn(1, '=')
                                       .map(|s| s.to_string())
                                       .collect();
 

branches/tmp/src/doc/reference.md

@@ -977,13 +977,17 @@ An example of `use` declarations:
 
 ```
 # #![feature(core)]
+use std::iter::range_step;
 use std::option::Option::{Some, None};
 use std::collections::hash_map::{self, HashMap};
 
 fn foo<T>(_: T){}
 fn bar(map1: HashMap<String, usize>, map2: hash_map::HashMap<String, usize>){}
 
 fn main() {
+    // Equivalent to 'std::iter::range_step(0, 10, 2);'
+    range_step(0, 10, 2);
+
     // Equivalent to 'foo(vec![std::option::Option::Some(1.0f64),
     // std::option::Option::None]);'
     foo(vec![Some(1.0f64), None]);
@@ -1184,15 +1188,12 @@ the guarantee that these issues are never caused by safe code.
 
 * Data races
 * Dereferencing a null/dangling raw pointer
+* Mutating an immutable value/reference without `UnsafeCell`
 * Reads of [undef](http://llvm.org/docs/LangRef.html#undefined-values)
   (uninitialized) memory
 * Breaking the [pointer aliasing
   rules](http://llvm.org/docs/LangRef.html#pointer-aliasing-rules)
   with raw pointers (a subset of the rules used by C)
-* `&mut` and `&` follow LLVM’s scoped [noalias] model, except if the `&T`
-  contains an `UnsafeCell<U>`. Unsafe code must not violate these aliasing
-  guarantees.
-* Mutating an immutable value/reference without `UnsafeCell<U>`
 * Invoking undefined behavior via compiler intrinsics:
   * Indexing outside of the bounds of an object with `std::ptr::offset`
     (`offset` intrinsic), with
@@ -1209,8 +1210,6 @@ the guarantee that these issues are never caused by safe code.
   code. Rust's failure system is not compatible with exception handling in
   other languages. Unwinding must be caught and handled at FFI boundaries.
 
-[noalias]: http://llvm.org/docs/LangRef.html#noalias
-
 ##### Behaviour not considered unsafe
 
 This is a list of behaviour not considered *unsafe* in Rust terms, but that may
@@ -1648,7 +1647,7 @@ specific type.
 Implementations are defined with the keyword `impl`.
 
 ```
-# #[derive(Copy, Clone)]
+# #[derive(Copy)]
 # struct Point {x: f64, y: f64};
 # type Surface = i32;
 # struct BoundingBox {x: f64, y: f64, width: f64, height: f64};
@@ -1661,10 +1660,6 @@ struct Circle {
 
 impl Copy for Circle {}
 
-impl Clone for Circle {
-    fn clone(&self) -> Circle { *self }
-}
-
 impl Shape for Circle {
     fn draw(&self, s: Surface) { do_draw_circle(s, *self); }
     fn bounding_box(&self) -> BoundingBox {

branches/tmp/src/doc/trpl/SUMMARY.md

@@ -42,7 +42,5 @@
     * [Intrinsics](intrinsics.md)
     * [Lang items](lang-items.md)
     * [Link args](link-args.md)
-    * [Benchmark Tests](benchmark-tests.md)
-    * [Box Syntax and Patterns](box-syntax-and-patterns.md)
 * [Conclusion](conclusion.md)
 * [Glossary](glossary.md)