---

yaml
---
r: 97215
b: refs/heads/dist-snap
c: 0607c13
h: refs/heads/master
i:
  97213: 5c4729a
  97211: b6689c4
  97207: c1d746c
  97199: e501f60
  97183: 9ccc4e6
  97151: 8577238
v: v3

Author: sfackler

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 0cbb44aff9a9840c133ea454db7d302c247d5f0f
+refs/heads/dist-snap: 0607c138caf991c7dbe4fef57a08958a5e7fb621
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.gitmodules

@@ -1,6 +1,6 @@
 [submodule "src/llvm"]
 	path = src/llvm
-	url = https://github.com/luqmana/llvm.git
+	url = https://github.com/alexcrichton/llvm.git
 	branch = master
 [submodule "src/libuv"]
 	path = src/libuv

branches/dist-snap/mk/docs.mk

@@ -13,7 +13,6 @@
 ######################################################################
 
 DOCS :=
-CDOCS :=
 DOCS_L10N :=
 
 BASE_DOC_OPTS := --from=markdown --standalone --toc --number-sections
@@ -233,21 +232,8 @@ doc/$(1)/index.html: $$(RUSTDOC) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3))
 DOCS += doc/$(1)/index.html
 endef
 
-define compiledoc
-doc/$(1)/index.html: $$(RUSTDOC) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3))
-	@$$(call E, rustdoc: $$@)
-	$(Q)$(RUSTDOC) --cfg stage2 $(2)
-
-CDOCS += doc/$(1)/index.html
-endef
-
 $(eval $(call libdoc,std,$(STDLIB_CRATE),$(CFG_BUILD)))
 $(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(CFG_BUILD)))
-$(eval $(call libdoc,native,$(LIBNATIVE_CRATE),$(CFG_BUILD)))
-$(eval $(call libdoc,green,$(LIBGREEN_CRATE),$(CFG_BUILD)))
-
-$(eval $(call compiledoc,rustc,$(COMPILER_CRATE),$(CFG_BUILD)))
-$(eval $(call compiledoc,syntax,$(LIBSYNTAX_CRATE),$(CFG_BUILD)))
 
 
 ifdef CFG_DISABLE_DOCS
@@ -270,7 +256,6 @@ doc/version_info.html: version_info.html.template $(MKFILE_DEPS) \
 GENERATED += doc/version.md doc/version_info.html
 
 docs: $(DOCS)
-compiler-docs: $(CDOCS)
 
 docs-l10n: $(DOCS_L10N)
 

branches/dist-snap/src/libgreen/sched.rs

@@ -1433,7 +1433,7 @@ mod test {
             drop(handle);
 
             let mut handle = pool.spawn_sched();
-            handle.send(PinnedTask(pool.task(TaskOpts::new(), proc() {
+            handle.send(TaskFromFriend(pool.task(TaskOpts::new(), proc() {
                 // Wait until the other task has its lock
                 start_po.recv();
 

branches/dist-snap/src/librustc/front/test.rs

@@ -40,7 +40,7 @@ struct Test {
 struct TestCtxt {
     sess: session::Session,
     path: RefCell<~[ast::Ident]>,
-    ext_cx: @ExtCtxt,
+    ext_cx: ExtCtxt,
     testfns: RefCell<~[Test]>,
     is_extra: bool,
     config: ast::CrateConfig,
@@ -163,8 +163,7 @@ fn generate_test_harness(sess: session::Session, crate: ast::Crate)
         config: crate.config.clone(),
     };
 
-    let ext_cx = cx.ext_cx;
-    ext_cx.bt_push(ExpnInfo {
+    cx.ext_cx.bt_push(ExpnInfo {
         call_site: dummy_sp(),
         callee: NameAndSpan {
             name: @"test",
@@ -177,7 +176,7 @@ fn generate_test_harness(sess: session::Session, crate: ast::Crate)
         cx: cx
     };
     let res = fold.fold_crate(crate);
-    ext_cx.bt_pop();
+    cx.ext_cx.bt_pop();
     return res;
 }
 
@@ -313,7 +312,7 @@ fn mk_test_module(cx: &TestCtxt) -> @ast::item {
 
     // The synthesized main function which will call the console test runner
     // with our list of tests
-    let mainfn = (quote_item!(cx.ext_cx,
+    let mainfn = (quote_item!(&cx.ext_cx,
         pub fn main() {
             #[main];
             extra::test::test_main_static(::std::os::args(), TESTS);
@@ -377,7 +376,7 @@ fn mk_tests(cx: &TestCtxt) -> @ast::item {
     // The vector of test_descs for this crate
     let test_descs = mk_test_descs(cx);
 
-    (quote_item!(cx.ext_cx,
+    (quote_item!(&cx.ext_cx,
         pub static TESTS : &'static [self::extra::test::TestDescAndFn] =
             $test_descs
         ;
@@ -438,24 +437,24 @@ fn mk_test_desc_and_fn_rec(cx: &TestCtxt, test: &Test) -> @ast::Expr {
     };
 
     let t_expr = if test.bench {
-        quote_expr!(cx.ext_cx, self::extra::test::StaticBenchFn($fn_expr) )
+        quote_expr!(&cx.ext_cx, self::extra::test::StaticBenchFn($fn_expr) )
     } else {
-        quote_expr!(cx.ext_cx, self::extra::test::StaticTestFn($fn_expr) )
+        quote_expr!(&cx.ext_cx, self::extra::test::StaticTestFn($fn_expr) )
     };
 
     let ignore_expr = if test.ignore {
-        quote_expr!(cx.ext_cx, true )
+        quote_expr!(&cx.ext_cx, true )
     } else {
-        quote_expr!(cx.ext_cx, false )
+        quote_expr!(&cx.ext_cx, false )
     };
 
     let fail_expr = if test.should_fail {
-        quote_expr!(cx.ext_cx, true )
+        quote_expr!(&cx.ext_cx, true )
     } else {
-        quote_expr!(cx.ext_cx, false )
+        quote_expr!(&cx.ext_cx, false )
     };
 
-    let e = quote_expr!(cx.ext_cx,
+    let e = quote_expr!(&cx.ext_cx,
         self::extra::test::TestDescAndFn {
             desc: self::extra::test::TestDesc {
                 name: self::extra::test::StaticTestName($name_expr),

branches/dist-snap/src/librustdoc/clean.rs

@@ -1123,8 +1123,6 @@ fn lit_to_str(lit: &ast::lit) -> ~str {
 
 fn name_from_pat(p: &ast::Pat) -> ~str {
     use syntax::ast::*;
-    debug!("Trying to get a name from pattern: {:?}", p);
-
     match p.node {
         PatWild => ~"_",
         PatWildMulti => ~"..",
@@ -1136,12 +1134,9 @@ fn name_from_pat(p: &ast::Pat) -> ~str {
         PatBox(p) => name_from_pat(p),
         PatUniq(p) => name_from_pat(p),
         PatRegion(p) => name_from_pat(p),
-        PatLit(..) => {
-            warn!("tried to get argument name from PatLit, \
-                  which is silly in function arguments");
-            ~"()"
-        },
-        PatRange(..) => fail!("tried to get argument name from PatRange, \
+        PatLit(..) => fail!("tried to get argument name from pat_lit, \
+                            which is not allowed in function arguments"),
+        PatRange(..) => fail!("tried to get argument name from pat_range, \
                               which is not allowed in function arguments"),
         PatVec(..) => fail!("tried to get argument name from pat_vec, \
                              which is not allowed in function arguments")

branches/dist-snap/src/librustpkg/util.rs

@@ -75,7 +75,7 @@ struct ListenerFn {
 
 struct ReadyCtx {
     sess: session::Session,
-    ext_cx: @ExtCtxt,
+    ext_cx: ExtCtxt,
     path: ~[ast::Ident],
     fns: ~[ListenerFn]
 }

branches/dist-snap/src/libstd/any.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Traits for dynamic typing of any type (through runtime reflection)
-//!
 //! This module implements the `Any` trait, which enables dynamic typing
 //! of any type, through runtime reflection.
 //!

branches/dist-snap/src/libstd/ascii.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations on ASCII strings and characters
+//! Operations on ASCII strings and characters.
 
 use to_str::{ToStr,IntoStr};
 use str;

branches/dist-snap/src/libstd/at_vec.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations on managed vectors (`@[T]` type)
+//! Managed vectors
 
 use clone::Clone;
 use container::Container;

branches/dist-snap/src/libstd/bool.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations on boolean values (`bool` type)
+//! The `bool` module contains useful code to help work with boolean values.
 //!
 //! A quick summary:
 //!

branches/dist-snap/src/libstd/char.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Unicode characters manipulation (`char` type)
+//! Utilities for manipulating the char type
 
 use cast::transmute;
 use option::{None, Option, Some};

branches/dist-snap/src/libstd/clone.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-/*! The `Clone` trait for types that cannot be 'implicitly copied'
+/*! The Clone trait for types that cannot be "implicitly copied"
 
 In Rust, some simple types are "implicitly copyable" and when you
 assign them or pass them as arguments, the receiver will get a copy,

branches/dist-snap/src/libstd/comm/mod.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Communication primitives for concurrent tasks (`Chan` and `Port` types)
+//! Rust Communication Primitives
 //!
 //! Rust makes it very difficult to share data among tasks to prevent race
 //! conditions and to improve parallelism, but there is often a need for
@@ -599,7 +599,7 @@ impl<T: Send> Chan<T> {
                 // the TLS overhead can be a bit much.
                 n => {
                     assert!(n >= 0);
-                    if can_resched && n > 0 && n % RESCHED_FREQ == 0 {
+                    if n > 0 && n % RESCHED_FREQ == 0 {
                         let task: ~Task = Local::take();
                         task.maybe_yield();
                     }

branches/dist-snap/src/libstd/container.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Traits for generic containers (including `Map` and `Set`)
+//! Container traits
 
 use option::Option;
 

branches/dist-snap/src/libstd/default.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! The `Default` trait for types which may have meaningful default values
+//! The Default trait
 
 /// A trait that types which have a useful default value should implement.
 pub trait Default {

branches/dist-snap/src/libstd/either.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Representing values with two possibilities (`Either` type)
+//! A type that represents one of two alternatives
 
 #[allow(missing_doc)];
 

branches/dist-snap/src/libstd/fmt/mod.rs

@@ -10,7 +10,7 @@
 
 /*!
 
-Utilities for formatting and printing strings
+The Formatting Module
 
 This module contains the runtime support for the `format!` syntax extension.
 This macro is implemented in the compiler to emit calls to this module in order

branches/dist-snap/src/libstd/from_str.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! The `FromStr` trait for types that can be created from strings
+//! The trait for types that can be created from strings
 
 use option::Option;
 

branches/dist-snap/src/libstd/hashmap.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Unordered containers, implemented as hash-tables (`HashSet` and `HashMap` types)
+//! An unordered map and set type implemented as hash tables
 //!
 //! The tables use a keyed hash with new random keys generated for each container, so the ordering
 //! of a set of keys in a hash table is randomized.

branches/dist-snap/src/libstd/kinds.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 /*!
-Primitive traits representing basic 'kinds' of types
+The kind traits
 
 Rust types can be classified in various useful ways according to
 intrinsic properties of the type. These classifications, often called

branches/dist-snap/src/libstd/logging.rs

@@ -10,7 +10,7 @@
 
 /*!
 
-Utilities for program-wide and customizable logging
+Logging
 
 This module is used by the compiler when emitting output for the logging family
 of macros. The methods of this module shouldn't necessarily be used directly,

branches/dist-snap/src/libstd/num/cmath.rs

@@ -12,8 +12,6 @@
 #[allow(non_uppercase_statics)];
 #[allow(dead_code)];
 
-//! Bindings for the C math library (for basic mathematic functions)
-
 // function names are almost identical to C's libmath, a few have been
 // renamed, grep for "rename:"
 

branches/dist-snap/src/libstd/num/f32.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations and constants for 32-bits floats (`f32` type)
+//! Operations and constants for `f32`
 #[allow(missing_doc)];
 
 use prelude::*;

branches/dist-snap/src/libstd/num/f64.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations and constants for 64-bits floats (`f64` type)
+//! Operations and constants for `f64`
 
 #[allow(missing_doc)];
 

branches/dist-snap/src/libstd/num/i16.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations and constants for signed 16-bits integers (`i16` type)
+//! Operations and constants for `i16`
 
 #[allow(non_uppercase_statics)];
 

branches/dist-snap/src/libstd/num/i32.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations and constants for signed 32-bits integers (`i32` type)
+//! Operations and constants for `i32`
 
 #[allow(non_uppercase_statics)];
 

branches/dist-snap/src/libstd/num/i64.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations and constants for signed 64-bits integers (`i64` type)
+//! Operations and constants for `i64`
 
 #[allow(non_uppercase_statics)];
 

branches/dist-snap/src/libstd/num/i8.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations and constants for signed 8-bits integers (`i8` type)
+//! Operations and constants for `i8`
 
 #[allow(non_uppercase_statics)];
 

branches/dist-snap/src/libstd/num/int.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Operations and constants for architecture-sized signed integers (`int` type)
+//! Operations and constants for `int`
 
 #[allow(non_uppercase_statics)];