---

yaml
---
r: 105470
b: refs/heads/master
c: 7180b5d
h: refs/heads/master
v: v3

Author: Aatch

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 61d5bc5d2da87190c199f3303ef4c75613fdfb96
+refs/heads/master: 7180b5de4452095b032e6c77a77d8c6f81c4f6d3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
 refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13

trunk/src/doc/rust.md

@@ -3136,12 +3136,8 @@ machine.
 
 The types `char` and `str` hold textual data.
 
-A value of type `char` is a [Unicode scalar value](
-http://www.unicode.org/glossary/#unicode_scalar_value)
-(ie. a code point that is not a surrogate),
-represented as a 32-bit unsigned word in the 0x0000 to 0xD7FF 
-or 0xE000 to 0x10FFFF range.
-A `[char]` vector is effectively an UCS-4 / UTF-32 string.
+A value of type `char` is a Unicode character,
+represented as a 32-bit unsigned word holding a UCS-4 codepoint.
 
 A value of type `str` is a Unicode string,
 represented as a vector of 8-bit unsigned bytes holding a sequence of UTF-8 codepoints.

trunk/src/doc/rustdoc.md

@@ -43,7 +43,7 @@ pub fn recalibrate() {
 Doc comments are markdown, and are currently parsed with the
 [sundown][sundown] library. rustdoc does not yet do any fanciness such as
 referencing other items inline, like javadoc's `@see`. One exception to this
-is that the first paragraph will be used as the "summary" of an item in the
+is that the first paragrah will be used as the "summary" of an item in the
 generated documentation:
 
 ~~~
@@ -79,11 +79,11 @@ rustdoc can also generate JSON, for consumption by other tools, with
 
 # Using the Documentation
 
-The web pages generated by rustdoc present the same logical hierarchy that one
+The web pages generated by rustdoc present the same logical heirarchy that one
 writes a library with. Every kind of item (function, struct, etc) has its own
 color, and one can always click on a colored type to jump to its
 documentation. There is a search bar at the top, which is powered by some
-JavaScript and a statically-generated search index. No special web server is
+javascript and a statically-generated search index. No special web server is
 required for the search.
 
 [sundown]: https://github.com/vmg/sundown/
@@ -108,7 +108,7 @@ code, the `ignore` string can be added to the three-backtick form of markdown
 code block.
 
     /**
-    # nested code fences confuse sundown => indentation + comment to
+    # nested codefences confuse sundown => indentation + comment to
     #  avoid failing tests
     ```
     // This is a testable code block
@@ -126,7 +126,7 @@ You can specify that the test's execution should fail with the `should_fail`
 directive.
 
     /**
-    # nested code fences confuse sundown => indentation + comment to
+    # nested codefences confuse sundown => indentation + comment to
     #  avoid failing tests
     ```should_fail
     // This code block is expected to generate a failure when run
@@ -138,7 +138,7 @@ You can specify that the code block should be compiled but not run with the
 `no_run` directive.
 
     /**
-    # nested code fences confuse sundown => indentation + comment to
+    # nested codefences confuse sundown => indentation + comment to
     #  avoid failing tests
     ```no_run
     // This code will be compiled but not executed
@@ -153,7 +153,7 @@ testing the code block (NB. the space after the `#` is required, so
 that one can still write things like `#[deriving(Eq)]`).
 
     /**
-    # nested code fences confuse sundown => indentation + comment to
+    # nested codefences confuse sundown => indentation + comment to
     #  avoid failing tests
     ```rust
     # /!\ The three following lines are comments, which are usually stripped off by
@@ -162,7 +162,7 @@ that one can still write things like `#[deriving(Eq)]`).
     # these first five lines but a non breakable one.
     #
     # // showing 'fib' in this documentation would just be tedious and detracts from
-    # // what's actually being documented.
+    # // what's actualy being documented.
     # fn fib(n: int) { n + 2 }
 
     do spawn { fib(200); }
@@ -190,7 +190,7 @@ $ rustdoc --test lib.rs --test-args '--help'
 ~~~
 
 When testing a library, code examples will often show how functions are used,
-and this code often requires `use`-ing paths from the crate. To accommodate this,
+and this code often requires `use`-ing paths from the crate. To accomodate this,
 rustdoc will implicitly add `extern crate <crate>;` where `<crate>` is the name of
 the crate being tested to the top of each code example. This means that rustdoc
 must be able to find a compiled version of the library crate being tested. Extra

trunk/src/libgetopts/lib.rs

@@ -83,7 +83,7 @@
 #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
-#[deny(missing_doc)];
+#[allow(missing_doc)];
 #[allow(deprecated_owned_vector)];
 
 #[feature(globs, phase)];
@@ -98,34 +98,27 @@ use std::vec;
 
 /// Name of an option. Either a string or a single char.
 #[deriving(Clone, Eq)]
+#[allow(missing_doc)]
 pub enum Name {
-    /// A string representing the long name of an option.
-    /// For example: "help"
     Long(~str),
-    /// A char representing the short name of an option.
-    /// For example: 'h'
     Short(char),
 }
 
 /// Describes whether an option has an argument.
 #[deriving(Clone, Eq)]
+#[allow(missing_doc)]
 pub enum HasArg {
-    /// The option requires an argument.
     Yes,
-    /// The option is just a flag, therefore no argument.
     No,
-    /// The option argument is optional and it could or not exist.
     Maybe,
 }
 
 /// Describes how often an option may occur.
 #[deriving(Clone, Eq)]
+#[allow(missing_doc)]
 pub enum Occur {
-    /// The option occurs once.
     Req,
-    /// The option could or not occur.
     Optional,
-    /// The option occurs once or multiple times.
     Multi,
 }
 
@@ -183,16 +176,12 @@ pub struct Matches {
 /// expected format. Call the `to_err_msg` method to retrieve the
 /// error as a string.
 #[deriving(Clone, Eq, Show)]
+#[allow(missing_doc)]
 pub enum Fail_ {
-    /// The option requires an argument but none was passed.
     ArgumentMissing(~str),
-    /// The passed option is not declared among the possible options.
     UnrecognizedOption(~str),
-    /// A required option is not present.
     OptionMissing(~str),
-    /// A single occurence option is being used multiple times.
     OptionDuplicated(~str),
-    /// There's an argument being passed to a non-argument option.
     UnexpectedArgument(~str),
 }
 

trunk/src/libnum/bigint.rs

@@ -117,7 +117,7 @@ impl TotalOrd for BigUint {
         if s_len < o_len { return Less; }
         if s_len > o_len { return Greater;  }
 
-        for (&self_i, &other_i) in self.data.iter().rev().zip(other.data.iter().rev()) {
+        for (&self_i, &other_i) in self.data.rev_iter().zip(other.data.rev_iter()) {
             if self_i < other_i { return Less; }
             if self_i > other_i { return Greater; }
         }
@@ -788,7 +788,7 @@ impl BigUint {
 
         let mut borrow = 0;
         let mut shifted_rev = Vec::with_capacity(self.data.len());
-        for elem in self.data.iter().rev() {
+        for elem in self.data.rev_iter() {
             shifted_rev.push((*elem >> n_bits) | borrow);
             borrow = *elem << (BigDigit::bits - n_bits);
         }

trunk/src/librustc/back/archive.rs

@@ -28,17 +28,17 @@ use syntax::abi;
 
 pub static METADATA_FILENAME: &'static str = "rust.metadata.bin";
 
-pub struct Archive<'a> {
-    priv sess: &'a Session,
+pub struct Archive {
+    priv sess: Session,
     priv dst: Path,
 }
 
 pub struct ArchiveRO {
     priv ptr: ArchiveRef,
 }
 
-fn run_ar(sess: &Session, args: &str, cwd: Option<&Path>,
-          paths: &[&Path]) -> ProcessOutput {
+fn run_ar(sess: Session, args: &str, cwd: Option<&Path>,
+        paths: &[&Path]) -> ProcessOutput {
     let ar = get_ar_prog(sess);
 
     let mut args = vec!(args.to_owned());
@@ -74,16 +74,16 @@ fn run_ar(sess: &Session, args: &str, cwd: Option<&Path>,
     }
 }
 
-impl<'a> Archive<'a> {
+impl Archive {
     /// Initializes a new static archive with the given object file
-    pub fn create<'b>(sess: &'a Session, dst: &'b Path,
-                      initial_object: &'b Path) -> Archive<'a> {
+    pub fn create<'a>(sess: Session, dst: &'a Path,
+                      initial_object: &'a Path) -> Archive {
         run_ar(sess, "crus", None, [dst, initial_object]);
         Archive { sess: sess, dst: dst.clone() }
     }
 
     /// Opens an existing static archive
-    pub fn open(sess: &'a Session, dst: Path) -> Archive<'a> {
+    pub fn open(sess: Session, dst: Path) -> Archive {
         assert!(dst.exists());
         Archive { sess: sess, dst: dst }
     }
@@ -206,7 +206,7 @@ impl<'a> Archive<'a> {
         let unixlibname = format!("lib{}.a", name);
 
         let mut rustpath = filesearch::rust_path();
-        rustpath.push(self.sess.filesearch().get_target_lib_path());
+        rustpath.push(self.sess.filesearch.get_target_lib_path());
         let addl_lib_search_paths = self.sess
                                         .opts
                                         .addl_lib_search_paths