---

yaml
---
r: 151806
b: refs/heads/try2
c: 14d3dbe
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: bf8648dbdad525eebe90e4920439b30c0440d682
+refs/heads/try2: 14d3dbe292dc4ac590dabd0c33fe18edb7810be9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/crates.mk

@@ -51,15 +51,14 @@
 
 TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
                  uuid serialize sync getopts collections num test time rand \
-		 workcache url log regex graphviz core rlibc alloc
+		 workcache url log regex graphviz core rlibc
 HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
 
 DEPS_core :=
 DEPS_rlibc :=
-DEPS_alloc := core libc native:jemalloc
-DEPS_std := core libc alloc native:rustrt native:backtrace
+DEPS_std := core libc native:rustrt native:compiler-rt native:backtrace native:jemalloc
 DEPS_graphviz := std
 DEPS_green := std rand native:context_switch
 DEPS_rustuv := std native:uv native:uv_support
@@ -77,7 +76,7 @@ DEPS_serialize := std collections log
 DEPS_term := std collections log
 DEPS_semver := std
 DEPS_uuid := std serialize rand
-DEPS_sync := std alloc
+DEPS_sync := std
 DEPS_getopts := std
 DEPS_collections := std rand
 DEPS_fourcc := syntax std
@@ -102,7 +101,6 @@ TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
 
 ONLY_RLIB_core := 1
 ONLY_RLIB_rlibc := 1
-ONLY_RLIB_alloc := 1
 
 ################################################################################
 # You should not need to edit below this line

branches/try2/src/compiletest/runtest.rs

@@ -9,8 +9,7 @@
 // except according to those terms.
 
 use common::Config;
-use common::{CompileFail, Pretty, RunFail, RunPass, DebugInfoGdb};
-use common::{Codegen, DebugInfoLldb};
+use common::{CompileFail, Pretty, RunFail, RunPass, DebugInfoGdb, DebugInfoLldb};
 use errors;
 use header::TestProps;
 use header;

branches/try2/src/doc/guide-pointers.md

@@ -32,7 +32,7 @@ fn main() {
 And now I get an error:
 
 ~~~ {.notrust}
-error: mismatched types: expected `&int` but found `<generic integer #0>` (expected &-ptr but found integral variable)
+error: mismatched types: expected `&int` but found `<VI0>` (expected &-ptr but found integral variable)
 ~~~
 
 What gives? It needs a pointer! Therefore I have to use pointers!"
@@ -73,7 +73,7 @@ However.
 Here are the use-cases for pointers. I've prefixed them with the name of the
 pointer that satisfies that use-case:
 
-1. Owned: `Box<Trait>` must be a pointer, because you don't know the size of the
+1. Owned: ~Trait must be a pointer, because you don't know the size of the
 object, so indirection is mandatory.
 2. Owned: You need a recursive data structure. These can be infinite sized, so
 indirection is mandatory.

branches/try2/src/liballoc/lib.rs

@@ -634,7 +634,7 @@ impl<'a> Iterator<uint> for SetItems<'a> {
 
 #[cfg(test)]
 mod test_map {
-    use super::{TrieMap, TrieNode, Internal, External, Nothing};
+    use super::{TrieMap, TrieNode, Internal, External};
     use std::iter::range_step;
     use std::uint;
 

branches/try2/src/liballoc/util.rs

@@ -43,16 +43,44 @@ pub mod rt;
 
 pub type Result = result::Result<(), FormatError>;
 
-/// dox
+/// The error type which is returned from formatting a message into a stream.
+///
+/// This type does not support transmission of an error other than that an error
+/// occurred. Any extra information must be arranged to be transmitted through
+/// some other means.
 pub enum FormatError {
-    /// dox
+    /// A generic write error occurred during formatting, no other information
+    /// is transmitted via this variant.
     WriteError,
 }
 
-/// dox
+/// A collection of methods that are required to format a message into a stream.
+///
+/// This trait is the type which this modules requires when formatting
+/// information. This is similar to the standard library's `io::Writer` trait,
+/// but it is only intended for use in libcore.
+///
+/// This trait should generally not be implemented by consumers of the standard
+/// library. The `write!` macro accepts an instance of `io::Writer`, and the
+/// `io::Writer` trait is favored over implementing this trait.
 pub trait FormatWriter {
-    /// dox
+    /// Writes a slice of bytes into this writer, returning whether the write
+    /// succeeded.
+    ///
+    /// This method can only succeed if the entire byte slice was successfully
+    /// written, and this method will not return until all data has been
+    /// written or an error occurs.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an instance of `FormatError` on error.
     fn write(&mut self, bytes: &[u8]) -> Result;
+
+    /// Glue for usage of the `write!` macro with implementors of this trait.
+    ///
+    /// This method should generally not be invoked manually, but rather through
+    /// the `write!` macro itself.
+    fn write_fmt(&mut self, args: &Arguments) -> Result { write(self, args) }
 }
 
 /// A struct to represent both where to emit formatting strings to and how they
@@ -70,6 +98,10 @@ pub struct Formatter<'a> {
     /// Optionally specified precision for numeric types
     pub precision: Option<uint>,
 
+    #[allow(missing_doc)]
+    #[cfg(stage0)]
+    pub buf: &'a mut FormatWriter,
+    #[cfg(not(stage0))]
     buf: &'a mut FormatWriter,
     curarg: slice::Items<'a, Argument<'a>>,
     args: &'a [Argument<'a>],

branches/try2/src/libcollections/trie.rs

@@ -10,23 +10,7 @@
 
 //! The core prelude
 //!
-//! This module is intended for users of libcore which do not link to libstd as
-//! well. This module is not imported by default, but using the entire contents
-//! of this module will provide all of the useful traits and types in libcore
-//! that one would expect from the standard library as well.
-//!
-//! There is no method to automatically inject this prelude, and this prelude is
-//! a subset of the standard library's prelude.
-//!
-//! # Example
-//!
-//! ```ignore
-//! # fn main() {
-//! #![feature(globs)]
-//!
-//! use core::prelude::*;
-//! # }
-//! ```
+//! For more information, see std::prelude.
 
 // Reexported core operators
 pub use kinds::{Copy, Send, Sized, Share};

branches/try2/src/libcore/fmt/mod.rs

@@ -1028,7 +1028,7 @@ mod test {
     use {TaskState, PoolConfig, SchedPool};
     use basic;
     use sched::{TaskFromFriend, PinnedTask};
-    use task::{GreenTask, HomeSched, AnySched};
+    use task::{GreenTask, HomeSched};
 
     fn pool() -> SchedPool {
         SchedPool::new(PoolConfig {

branches/try2/src/libcore/prelude.rs

@@ -12,8 +12,7 @@
 use back::link;
 use driver::session::Session;
 use driver::{config, PpMode};
-use driver::{PpmFlowGraph, PpmExpanded, PpmExpandedIdentified, PpmTyped};
-use driver::{PpmIdentified};
+use driver::PpmFlowGraph; // FIXME (#14221).
 use front;
 use lib::llvm::{ContextRef, ModuleRef};
 use metadata::common::LinkMeta;