---

yaml
---
r: 109950
b: refs/heads/master
c: 51ea4fb
h: refs/heads/master
v: v3

Author: ckendell

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 339d4002617d5b36d6125d8a1781a6ada2e0a3f8
+refs/heads/master: 51ea4fb17f8a6c37220b971dd8c7f343f9fdcea2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c7fac4471201977fdb1c0c0a26c87287e12dc644
 refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d

trunk/README.md

@@ -5,7 +5,7 @@ documentation.
 
 ## Quick Start
 
-1. Download a [binary installer][installer] for your platform.
+1. Download a [binary insaller][installer] for your platform.
 2. Read the [tutorial].
 3. Enjoy!
 

trunk/mk/dist.mk

@@ -215,7 +215,7 @@ dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
 dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
 dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
 dist-install-dir-$(1): PREPARE_CLEAN=true
-dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
+dist-install-dir-$(1): prepare-base-dir-$(1)
 	$$(Q)(cd $$(PREPARE_DEST_DIR)/ && find . -type f | sed 's/^\.\///') \
       > tmp/dist/manifest-$(1).in
 	$$(Q)mv tmp/dist/manifest-$(1).in $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/rustlib/manifest.in
@@ -224,7 +224,6 @@ dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
 	$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)
 	$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)
 	$$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)
-	$$(Q)cp -r doc $$(PREPARE_DEST_DIR)
 	$$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR)
 
 dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)

trunk/src/doc/guide-unsafe.md

@@ -294,7 +294,7 @@ asm!(assembly template
    );
 ```
 
-Any use of `asm` is feature gated (requires `#![feature(asm)]` on the
+Any use of `asm` is feature gated (requires `#[feature(asm)];` on the
 crate to allow) and of course requires an `unsafe` block.
 
 > **Note**: the examples here are given in x86/x86-64 assembly, but all
@@ -306,7 +306,7 @@ The `assembly template` is the only required parameter and must be a
 literal string (i.e `""`)
 
 ```
-#![feature(asm)]
+#[feature(asm)];
 
 #[cfg(target_arch = "x86")]
 #[cfg(target_arch = "x86_64")]
@@ -334,7 +334,7 @@ Output operands, input operands, clobbers and options are all optional
 but you must add the right number of `:` if you skip them:
 
 ```
-# #![feature(asm)]
+# #[feature(asm)];
 # #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")]
 # fn main() { unsafe {
 asm!("xor %eax, %eax"
@@ -348,7 +348,7 @@ asm!("xor %eax, %eax"
 Whitespace also doesn't matter:
 
 ```
-# #![feature(asm)]
+# #[feature(asm)];
 # #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")]
 # fn main() { unsafe {
 asm!("xor %eax, %eax" ::: "eax");
@@ -362,7 +362,7 @@ Input and output operands follow the same format: `:
 expressions must be mutable lvalues:
 
 ```
-# #![feature(asm)]
+# #[feature(asm)];
 # #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")]
 fn add(a: int, b: int) -> int {
     let mut c = 0;
@@ -390,7 +390,7 @@ compiler not to assume any values loaded into those registers will
 stay valid.
 
 ```
-# #![feature(asm)]
+# #[feature(asm)];
 # #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")]
 # fn main() { unsafe {
 // Put the value 0x200 in eax

trunk/src/doc/po/ja/rust.md.po

@@ -1,5 +1,5 @@
 # Japanese translations for Rust package
-# Copyright (C) 2013-2014 The Rust Project Developers
+# Copyright (C) 2013 The Rust Project Developers
 # This file is distributed under the same license as the Rust package.
 # Automatically generated, 2013.
 #
@@ -886,7 +886,7 @@ msgstr ""
 #: src/doc/rust.md:2008
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
-msgid "~~~~ {.ignore} #![warn(unstable)]"
+msgid "~~~~ {.ignore} #[warn(unstable)];"
 msgstr ""
 "~~~~\n"
 "use std::task::spawn;"

trunk/src/doc/tutorial.md

@@ -1492,8 +1492,8 @@ Rust uses the unary star operator (`*`) to access the contents of a
 box or pointer, similarly to C.
 
 ~~~
-let owned = ~20;
-let borrowed = &30;
+let owned = ~10;
+let borrowed = &20;
 
 let sum = *owned + *borrowed;
 ~~~

trunk/src/etc/combine-tests.py

@@ -54,7 +54,7 @@ def scrub(b):
 #[crate_id=\"run_pass_stage2#0.1\"];
 #[crate_id=\"run_pass_stage2#0.1\"];
 #[feature(globs, macro_rules, struct_variant, managed_boxes)];
-#![allow(warnings)]
+#[allow(warnings)];
 extern crate collections;
 """
 )

trunk/src/libarena/lib.rs

@@ -23,6 +23,7 @@
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://static.rust-lang.org/doc/master")]
 #![allow(missing_doc)]
+#![allow(visible_private_types)] // NOTE: remove after a stage0 snap
 
 extern crate collections;
 

trunk/src/libcollections/lib.rs

@@ -22,6 +22,8 @@
 
 #![feature(macro_rules, managed_boxes, default_type_params, phase)]
 
+#![allow(visible_private_types)] // NOTE: remove after a stage0 snap
+
 extern crate rand;
 
 #[cfg(test)] extern crate test;

trunk/src/libcollections/priority_queue.rs

@@ -117,11 +117,6 @@ impl<T:Ord> PriorityQueue<T> {
     /// Create an empty PriorityQueue
     pub fn new() -> PriorityQueue<T> { PriorityQueue{data: ~[],} }
 
-    /// Create an empty PriorityQueue with capacity `capacity`
-    pub fn with_capacity(capacity: uint) -> PriorityQueue<T> {
-        PriorityQueue { data: slice::with_capacity(capacity) }
-    }
-
     /// Create a PriorityQueue from a vector (heapify)
     pub fn from_vec(xs: ~[T]) -> PriorityQueue<T> {
         let mut q = PriorityQueue{data: xs,};

trunk/src/libcollections/smallintmap.rs

@@ -112,11 +112,6 @@ impl<V> SmallIntMap<V> {
     /// Create an empty SmallIntMap
     pub fn new() -> SmallIntMap<V> { SmallIntMap{v: ~[]} }
 
-    /// Create an empty SmallIntMap with capacity `capacity`
-    pub fn with_capacity(capacity: uint) -> SmallIntMap<V> {
-        SmallIntMap { v: slice::with_capacity(capacity) }
-    }
-
     pub fn get<'a>(&'a self, key: &uint) -> &'a V {
         self.find(key).expect("key not present")
     }

trunk/src/libcollections/trie.rs

@@ -293,46 +293,32 @@ impl Mutable for TrieSet {
     fn clear(&mut self) { self.map.clear() }
 }
 
-impl Set<uint> for TrieSet {
-    #[inline]
-    fn contains(&self, value: &uint) -> bool {
-        self.map.contains_key(value)
-    }
-
-    #[inline]
-    fn is_disjoint(&self, other: &TrieSet) -> bool {
-        self.iter().all(|v| !other.contains(&v))
-    }
-
+impl TrieSet {
+    /// Create an empty TrieSet
     #[inline]
-    fn is_subset(&self, other: &TrieSet) -> bool {
-        self.iter().all(|v| other.contains(&v))
+    pub fn new() -> TrieSet {
+        TrieSet{map: TrieMap::new()}
     }
 
+    /// Return true if the set contains a value
     #[inline]
-    fn is_superset(&self, other: &TrieSet) -> bool {
-        other.is_subset(self)
+    pub fn contains(&self, value: &uint) -> bool {
+        self.map.contains_key(value)
     }
-}
 
-impl MutableSet<uint> for TrieSet {
+    /// Add a value to the set. Return true if the value was not already
+    /// present in the set.
     #[inline]
-    fn insert(&mut self, value: uint) -> bool {
+    pub fn insert(&mut self, value: uint) -> bool {
         self.map.insert(value, ())
     }
 
+    /// Remove a value from the set. Return true if the value was
+    /// present in the set.
     #[inline]
-    fn remove(&mut self, value: &uint) -> bool {
+    pub fn remove(&mut self, value: &uint) -> bool {
         self.map.remove(value)
     }
-}
-
-impl TrieSet {
-    /// Create an empty TrieSet
-    #[inline]
-    pub fn new() -> TrieSet {
-        TrieSet{map: TrieMap::new()}
-    }
 
     /// Visit all values in reverse order
     #[inline]

trunk/src/libgetopts/lib.rs

@@ -87,6 +87,8 @@
 #![deny(missing_doc)]
 #![deny(deprecated_owned_vector)]
 
+#![allow(visible_private_types)] // NOTE: remove after a stage0 snap
+
 #[cfg(test)] #[phase(syntax, link)] extern crate log;
 
 use std::cmp::Eq;

trunk/src/liblog/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -15,7 +15,7 @@ Utilities for program-wide and customizable logging
 ## Example
 
 ```
-#![feature(phase)]
+#[feature(phase)];
 #[phase(syntax, link)] extern crate log;
 
 fn main() {

trunk/src/liblog/macros.rs

@@ -21,7 +21,7 @@
 /// # Example
 ///
 /// ```
-/// #![feature(phase)]
+/// #[feature(phase)];
 /// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
@@ -45,7 +45,7 @@ macro_rules! log(
 /// # Example
 ///
 /// ```
-/// #![feature(phase)]
+/// #[feature(phase)];
 /// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
@@ -63,7 +63,7 @@ macro_rules! error(
 /// # Example
 ///
 /// ```
-/// #![feature(phase)]
+/// #[feature(phase)];
 /// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
@@ -81,7 +81,7 @@ macro_rules! warn(
 /// # Example
 ///
 /// ```
-/// #![feature(phase)]
+/// #[feature(phase)];
 /// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
@@ -101,7 +101,7 @@ macro_rules! info(
 /// # Example
 ///
 /// ```
-/// #![feature(phase)]
+/// #[feature(phase)];
 /// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {
@@ -118,7 +118,7 @@ macro_rules! debug(
 /// # Example
 ///
 /// ```
-/// #![feature(phase)]
+/// #[feature(phase)];
 /// #[phase(syntax, link)] extern crate log;
 ///
 /// # fn main() {

trunk/src/libnative/lib.rs

@@ -51,6 +51,8 @@
 #![deny(unused_result, unused_must_use)]
 #![allow(non_camel_case_types)]
 
+#![allow(visible_private_types)] // NOTE: remove after a stage0 snap
+
 // NB this crate explicitly does *not* allow glob imports, please seriously
 //    consider whether they're needed before adding that feature here (the
 //    answer is that you don't need them)

trunk/src/librand/lib.rs

@@ -71,6 +71,8 @@ println!("{:?}", tuple_ptr)
        html_root_url = "http://static.rust-lang.org/doc/master")]
 
 #![feature(macro_rules, managed_boxes, phase)]
+
+#![allow(visible_private_types)] // NOTE: remove after a stage0 snap
 #![deny(deprecated_owned_vector)]
 
 #[cfg(test)]

trunk/src/librustc/driver/session.rs

@@ -232,9 +232,6 @@ impl Session {
     pub fn span_end_note(&self, sp: Span, msg: &str) {
         self.diagnostic().span_end_note(sp, msg)
     }
-    pub fn fileline_note(&self, sp: Span, msg: &str) {
-        self.diagnostic().fileline_note(sp, msg)
-    }
     pub fn note(&self, msg: &str) {
         self.diagnostic().handler().note(msg)
     }

trunk/src/librustc/front/test.rs

@@ -404,17 +404,21 @@ fn is_test_crate(krate: &ast::Crate) -> bool {
 }
 
 fn mk_test_descs(cx: &TestCtxt) -> @ast::Expr {
+    let mut descs = Vec::new();
     debug!("building test vector from {} tests", cx.testfns.borrow().len());
+    for test in cx.testfns.borrow().iter() {
+        descs.push(mk_test_desc_and_fn_rec(cx, test));
+    }
+
+    let inner_expr = @ast::Expr {
+        id: ast::DUMMY_NODE_ID,
+        node: ast::ExprVec(descs, ast::MutImmutable),
+        span: DUMMY_SP,
+    };
 
     @ast::Expr {
         id: ast::DUMMY_NODE_ID,
-        node: ast::ExprVstore(@ast::Expr {
-            id: ast::DUMMY_NODE_ID,
-            node: ast::ExprVec(cx.testfns.borrow().iter().map(|test| {
-                mk_test_desc_and_fn_rec(cx, test)
-            }).collect()),
-            span: DUMMY_SP,
-        }, ast::ExprVstoreSlice),
+        node: ast::ExprVstore(inner_expr, ast::ExprVstoreSlice),
         span: DUMMY_SP,
     }
 }

trunk/src/librustc/lib.rs

@@ -31,6 +31,9 @@ This API is completely unstable and subject to change.
 #![feature(macro_rules, globs, struct_variant, managed_boxes, quote,
            default_type_params, phase)]
 
+#![allow(visible_private_types)] // NOTE: remove after a stage0 snap
+#![allow(unrecognized_lint)] // NOTE: remove after a stage0 snap
+
 extern crate flate;
 extern crate arena;
 extern crate syntax;