---

yaml
---
r: 120590
b: refs/heads/dist-snap
c: 1ccc51c
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 799ddba8dac2e6b6a7dc6927a7cc0b5e785deecb
+refs/heads/dist-snap: 1ccc51ce3b746ee702ef875a90b53b1b06fd2bf8
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/ty.rs

@@ -220,10 +220,10 @@ pub enum AutoRef {
     /// Convert from T to &T
     AutoPtr(Region, ast::Mutability),
 
-    /// Convert from ~[]/&[] to &[] (or str)
+    /// Convert from ~[]/&[] to &[] or str
     AutoBorrowVec(Region, ast::Mutability),
 
-    /// Convert from ~[]/&[] to &&[] (or str)
+    /// Convert from ~[]/&[] to &&[] or str
     AutoBorrowVecRef(Region, ast::Mutability),
 
     /// Convert from T to *T

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

@@ -32,7 +32,7 @@
 //!
 //! ## Pervasive types
 //!
-//! The [`option`](option/index.html) and [`result`](result/index.html)
+//! The [`option`](option/index.html) and [`result`](../core/result/index.html)
 //! modules define optional and error-handling types, `Option` and `Result`.
 //! [`iter`](../core/iter/index.html) defines Rust's iterator protocol
 //! along with a wide variety of iterators.

branches/dist-snap/src/libsyntax/attr.rs

@@ -336,7 +336,7 @@ pub fn test_cfg<AM: AttrMetaMethods, It: Iterator<AM>>
     no_cfgs || some_cfg_matches
 }
 
-/// Represents the #[deprecated="foo"] (etc) attributes.
+/// Represents the #[deprecated="foo"] and friends attributes.
 pub struct Stability {
     pub level: StabilityLevel,
     pub text: Option<InternedString>