---

yaml
---
r: 177150
b: refs/heads/tmp
c: 59c2de1
h: refs/heads/master
v: v3

Author: emanueLczirai

[refs]

@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 36d0e90e6be5ab9fc4cfd19b3b98eeafbfada84d
+refs/heads/tmp: 59c2de16dfc06506b15907543f0ab952bf07822c

branches/tmp/configure

@@ -28,8 +28,8 @@ need_ok() {
 
 need_cmd() {
     if command -v $1 >/dev/null 2>&1
-    then msg "found program $1"
-    else err "need program $1"
+    then msg "found $1"
+    else err "need $1"
     fi
 }
 
@@ -340,7 +340,6 @@ need_cmd date
 need_cmd tr
 need_cmd sed
 need_cmd file
-need_cmd make
 
 msg "inspecting environment"
 

branches/tmp/mk/main.mk

@@ -30,8 +30,8 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),beta)
-CFG_RELEASE=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
-CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
+CFG_RELEASE=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
+CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),nightly)

branches/tmp/src/compiletest/common.rs

@@ -12,8 +12,7 @@ pub use self::Mode::*;
 use std::fmt;
 use std::str::FromStr;
 
-#[cfg(stage0)] // NOTE: remove impl after snapshot
-#[derive(Clone, Copy, PartialEq, Show)]
+#[derive(Clone, PartialEq, Debug)]
 pub enum Mode {
     CompileFail,
     RunFail,
@@ -25,18 +24,7 @@ pub enum Mode {
     Codegen
 }
 
-#[cfg(not(stage0))] // NOTE: remove cfg after snapshot
-#[derive(Clone, Copy, PartialEq, Debug)]
-pub enum Mode {
-    CompileFail,
-    RunFail,
-    RunPass,
-    RunPassValgrind,
-    Pretty,
-    DebugInfoGdb,
-    DebugInfoLldb,
-    Codegen
-}
+impl Copy for Mode {}
 
 impl FromStr for Mode {
     fn from_str(s: &str) -> Option<Mode> {

branches/tmp/src/compiletest/compiletest.rs

@@ -24,8 +24,8 @@ extern crate getopts;
 extern crate log;
 
 use std::os;
-use std::old_io;
-use std::old_io::fs;
+use std::io;
+use std::io::fs;
 use std::str::FromStr;
 use std::thunk::Thunk;
 use getopts::{optopt, optflag, reqopt};
@@ -237,7 +237,7 @@ pub fn run_tests(config: &Config) {
     // sadly osx needs some file descriptor limits raised for running tests in
     // parallel (especially when we have lots and lots of child processes).
     // For context, see #8904
-    old_io::test::raise_fd_limit();
+    io::test::raise_fd_limit();
     // Prevent issue #21352 UAC blocking .exe containing 'patch' etc. on Windows
     // If #11207 is resolved (adding manifest to .exe) this becomes unnecessary
     os::setenv("__COMPAT_LAYER", "RunAsInvoker");

branches/tmp/src/compiletest/errors.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 use self::WhichLine::*;
 
-use std::old_io::{BufferedReader, File};
+use std::io::{BufferedReader, File};
 
 pub struct ExpectedError {
     pub line: uint,

branches/tmp/src/compiletest/header.rs

@@ -223,7 +223,7 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
 fn iter_header<F>(testfile: &Path, mut it: F) -> bool where
     F: FnMut(&str) -> bool,
 {
-    use std::old_io::{BufferedReader, File};
+    use std::io::{BufferedReader, File};
 
     let mut rdr = BufferedReader::new(File::open(testfile).unwrap());
     for ln in rdr.lines() {

branches/tmp/src/compiletest/procsrv.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::old_io::process::{ProcessExit, Command, Process, ProcessOutput};
+use std::io::process::{ProcessExit, Command, Process, ProcessOutput};
 use std::dynamic_lib::DynamicLibrary;
 
 fn add_target_env(cmd: &mut Command, lib_path: &str, aux_path: Option<&str>) {
@@ -47,7 +47,7 @@ pub fn run(lib_path: &str,
     match cmd.spawn() {
         Ok(mut process) => {
             for input in input.iter() {
-                process.stdin.as_mut().unwrap().write_all(input.as_bytes()).unwrap();
+                process.stdin.as_mut().unwrap().write(input.as_bytes()).unwrap();
             }
             let ProcessOutput { status, output, error } =
                 process.wait_with_output().unwrap();
@@ -79,7 +79,7 @@ pub fn run_background(lib_path: &str,
     match cmd.spawn() {
         Ok(mut process) => {
             for input in input.iter() {
-                process.stdin.as_mut().unwrap().write_all(input.as_bytes()).unwrap();
+                process.stdin.as_mut().unwrap().write(input.as_bytes()).unwrap();
             }
 
             Some(process)

branches/tmp/src/compiletest/runtest.rs

@@ -23,14 +23,14 @@ use util;
 
 #[cfg(target_os = "windows")]
 use std::ascii::AsciiExt;
-use std::old_io::File;
-use std::old_io::fs::PathExtensions;
-use std::old_io::fs;
-use std::old_io::net::tcp;
-use std::old_io::process::ProcessExit;
-use std::old_io::process;
-use std::old_io::timer;
-use std::old_io;
+use std::io::File;
+use std::io::fs::PathExtensions;
+use std::io::fs;
+use std::io::net::tcp;
+use std::io::process::ProcessExit;
+use std::io::process;
+use std::io::timer;
+use std::io;
 use std::os;
 use std::iter::repeat;
 use std::str;
@@ -619,7 +619,7 @@ fn find_rust_src_root(config: &Config) -> Option<Path> {
 }
 
 fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path) {
-    use std::old_io::process::{Command, ProcessOutput};
+    use std::io::process::{Command, ProcessOutput};
 
     if config.lldb_python_dir.is_none() {
         fatal("Can't run LLDB test because LLDB's python path is not set.");
@@ -764,7 +764,7 @@ struct DebuggerCommands {
 
 fn parse_debugger_commands(file_path: &Path, debugger_prefix: &str)
                            -> DebuggerCommands {
-    use std::old_io::{BufferedReader, File};
+    use std::io::{BufferedReader, File};
 
     let command_directive = format!("{}-command", debugger_prefix);
     let check_directive = format!("{}-check", debugger_prefix);
@@ -1224,7 +1224,7 @@ fn compose_and_run_compiler(
 
 fn ensure_dir(path: &Path) {
     if path.is_dir() { return; }
-    fs::mkdir(path, old_io::USER_RWX).unwrap();
+    fs::mkdir(path, io::USER_RWX).unwrap();
 }
 
 fn compose_and_run(config: &Config, testfile: &Path,
@@ -1401,7 +1401,7 @@ fn dump_output(config: &Config, testfile: &Path, out: &str, err: &str) {
 fn dump_output_file(config: &Config, testfile: &Path,
                     out: &str, extension: &str) {
     let outfile = make_out_name(config, testfile, extension);
-    File::create(&outfile).write_all(out.as_bytes()).unwrap();
+    File::create(&outfile).write(out.as_bytes()).unwrap();
 }
 
 fn make_out_name(config: &Config, testfile: &Path, extension: &str) -> Path {

branches/tmp/src/doc/reference.md

@@ -1680,8 +1680,8 @@ specific type.
 Implementations are defined with the keyword `impl`.
 
 ```
-# #[derive(Copy)]
 # struct Point {x: f64, y: f64};
+# impl Copy for Point {}
 # type Surface = i32;
 # struct BoundingBox {x: f64, y: f64, width: f64, height: f64};
 # trait Shape { fn draw(&self, Surface); fn bounding_box(&self) -> BoundingBox; }
@@ -2219,7 +2219,7 @@ For any lint check `C`:
 
 The lint checks supported by the compiler can be found via `rustc -W help`,
 along with their default settings.  [Compiler
-plugins](book/plugins.html#lint-plugins) can provide additional lint checks.
+plugins](book/plugin.html#lint-plugins) can provide additional lint checks.
 
 ```{.ignore}
 mod m1 {
@@ -2291,7 +2291,136 @@ The name `str_eq` has a special meaning to the Rust compiler, and the presence
 of this definition means that it will use this definition when generating calls
 to the string equality function.
 
-A complete list of the built-in language items will be added in the future.
+A complete list of the built-in language items follows:
+
+#### Built-in Traits
+
+* `copy`
+  : Types that do not move ownership when used by-value.
+* `drop`
+  : Have destructors.
+* `send`
+  : Able to be sent across thread boundaries.
+* `sized`
+  : Has a size known at compile time.
+* `sync`
+  : Able to be safely shared between threads when aliased.
+
+#### Operators
+
+These language items are traits:
+
+* `add`
+  : Elements can be added (for example, integers and floats).
+* `sub`
+  : Elements can be subtracted.
+* `mul`
+  : Elements can be multiplied.
+* `div`
+  : Elements have a division operation.
+* `rem`
+  : Elements have a remainder operation.
+* `neg`
+  : Elements can be negated arithmetically.
+* `not`
+  : Elements can be negated logically.
+* `bitxor`
+  : Elements have an exclusive-or operation.
+* `bitand`
+  : Elements have a bitwise `and` operation.
+* `bitor`
+  : Elements have a bitwise `or` operation.
+* `shl`
+  : Elements have a left shift operation.
+* `shr`
+  : Elements have a right shift operation.
+* `index`
+  : Elements can be indexed.
+* `index_mut`
+  : ___Needs filling in___
+* `eq`
+  : Elements can be compared for equality.
+* `ord`
+  : Elements have a partial ordering.
+* `deref`
+  : `*` can be applied, yielding a reference to another type.
+* `deref_mut`
+  : `*` can be applied, yielding a mutable reference to another type.
+
+These are functions:
+
+* `fn`
+  : ___Needs filling in___
+* `fn_mut`
+  : ___Needs filling in___
+* `fn_once`
+  : ___Needs filling in___
+* `str_eq`
+  : Compare two strings (`&str`) for equality.
+* `strdup_uniq`
+  : Return a new unique string
+    containing a copy of the contents of a unique string.
+
+#### Types
+
+* `type_id`
+  : The type returned by the `type_id` intrinsic.
+* `unsafe`
+  : A type whose contents can be mutated through an immutable reference.
+
+#### Marker types
+
+These types help drive the compiler's analysis
+
+* `begin_unwind`
+  : ___Needs filling in___
+* `no_copy_bound`
+  : This type does not implement "copy", even if eligible.
+* `eh_personality`
+  : ___Needs filling in___
+* `exchange_free`
+  : Free memory that was allocated on the exchange heap.
+* `exchange_malloc`
+  : Allocate memory on the exchange heap.
+* `closure_exchange_malloc`
+  : ___Needs filling in___
+* `panic`
+  : Abort the program with an error.
+* `fail_bounds_check`
+  : Abort the program with a bounds check error.
+* `free`
+  : Free memory that was allocated on the managed heap.
+* `gc`
+  : ___Needs filling in___
+* `exchange_heap`
+  : ___Needs filling in___
+* `iterator`
+  : ___Needs filling in___
+* `contravariant_lifetime`
+  : The lifetime parameter should be considered contravariant.
+* `covariant_lifetime`
+  : The lifetime parameter should be considered covariant.
+* `invariant_lifetime`
+  : The lifetime parameter should be considered invariant.
+* `malloc`
+  : Allocate memory on the managed heap.
+* `owned_box`
+  : ___Needs filling in___
+* `stack_exhausted`
+  : ___Needs filling in___
+* `start`
+  : ___Needs filling in___
+* `contravariant_type`
+  : The type parameter should be considered contravariant.
+* `covariant_type`
+  : The type parameter should be considered covariant.
+* `invariant_type`
+  : The type parameter should be considered invariant.
+* `ty_desc`
+  : ___Needs filling in___
+
+> **Note:** This list is likely to become out of date. We should auto-generate
+> it from `librustc/middle/lang_items.rs`.
 
 ### Inline attributes
 
@@ -2489,6 +2618,10 @@ The currently implemented features of the reference compiler are:
                        for now until the specification of identifiers is fully
                        fleshed out.
 
+* `once_fns` - Onceness guarantees a closure is only executed once. Defining a
+               closure as `once` is unlikely to be supported going forward. So
+               they are hidden behind this feature until they are to be removed.
+
 * `plugin` - Usage of [compiler plugins][plugin] for custom lints or syntax extensions.
              These depend on compiler internals and are subject to change.
 
@@ -2519,7 +2652,9 @@ The currently implemented features of the reference compiler are:
                    declare a `static` as being unique per-thread leveraging
                    LLVM's implementation which works in concert with the kernel
                    loader and dynamic linker. This is not necessarily available
-                   on all platforms, and usage of it is discouraged.
+                   on all platforms, and usage of it is discouraged (rust
+                   focuses more on thread-local data instead of thread-local
+                   data).
 
 * `trace_macros` - Allows use of the `trace_macros` macro, which is a nasty
                    hack that will certainly be removed.
@@ -4234,4 +4369,4 @@ that have since been removed):
   pattern syntax
 
 [ffi]: book/ffi.html
-[plugin]: book/plugins.html
+[plugin]: book/plugin.html