---

yaml
---
r: 276891
b: refs/heads/try
c: 3e9b859
h: refs/heads/master
i:
  276889: 63dc1e9
  276887: 676bab1

Author: tbu-

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 76a58954e08aa1dede29a87adb50d4ad9179ba5c
+refs/heads/try: 3e9b859af2b54130a898741706a736ade406774d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/doc/book/concurrency.md

@@ -127,7 +127,9 @@ thread may outlive the scope of `x`, leading to a dangling pointer.
 
 To fix this, we use a `move` closure as mentioned in the error message. `move`
 closures are explained in depth [here](closures.html#move-closures); basically
-they move variables from their environment into themselves.
+they move variables from their environment into themselves. This means that `x`
+is now owned by the closure, and cannot be used in `main()` after the call to
+`spawn()`.
 
 ```rust
 use std::thread;
@@ -162,7 +164,7 @@ The same [ownership system](ownership.html) that helps prevent using pointers
 incorrectly also helps rule out data races, one of the worst kinds of
 concurrency bugs.
 
-As an example, here is a Rust program that could have a data race in many
+As an example, here is a Rust program that would have a data race in many
 languages. It will not compile:
 
 ```ignore
@@ -195,11 +197,6 @@ thread, and the thread takes ownership of the reference, we'd have three owners!
 `data` gets moved out of `main` in the first call to `spawn()`, so subsequent
 calls in the loop cannot use this variable.
 
-Note that this specific example will not cause a data race since different array
-indices are being accessed. But this can't be determined at compile time, and in
-a similar situation where `i` is a constant or is random, you would have a data
-race.
-
 So, we need some type that lets us have more than one owning reference to a
 value. Usually, we'd use `Rc<T>` for this, which is a reference counted type
 that provides shared ownership. It has some runtime bookkeeping that keeps track

branches/try/src/doc/book/crates-and-modules.md

@@ -118,7 +118,7 @@ build  deps  examples  libphrases-a7448e02a0468eaa.rlib  native
 `libphrases-hash.rlib` is the compiled crate. Before we see how to use this
 crate from another crate, let’s break it up into multiple files.
 
-# Multiple File Crates
+# Multiple file crates
 
 If each crate were just one file, these files would get very large. It’s often
 easier to split up crates into multiple files, and Rust supports this in two
@@ -190,19 +190,13 @@ mod farewells;
 ```
 
 Again, these declarations tell Rust to look for either
-`src/english/greetings.rs`, `src/english/farewells.rs`,
-`src/japanese/greetings.rs` and `src/japanese/farewells.rs` or
-`src/english/greetings/mod.rs`, `src/english/farewells/mod.rs`,
-`src/japanese/greetings/mod.rs` and
-`src/japanese/farewells/mod.rs`. Because these sub-modules don’t have
-their own sub-modules, we’ve chosen to make them
-`src/english/greetings.rs`, `src/english/farewells.rs`,
-`src/japanese/greetings.rs` and `src/japanese/farewells.rs`. Whew!
-
-The contents of `src/english/greetings.rs`,
-`src/english/farewells.rs`, `src/japanese/greetings.rs` and
-`src/japanese/farewells.rs` are all empty at the moment. Let’s add
-some functions.
+`src/english/greetings.rs` and `src/japanese/greetings.rs` or
+`src/english/farewells/mod.rs` and `src/japanese/farewells/mod.rs`. Because
+these sub-modules don’t have their own sub-modules, we’ve chosen to make them
+`src/english/greetings.rs` and `src/japanese/farewells.rs`. Whew!
+
+The contents of `src/english/greetings.rs` and `src/japanese/farewells.rs` are
+both empty at the moment. Let’s add some functions.
 
 Put this in `src/english/greetings.rs`:
 

branches/try/src/doc/book/lifetimes.md

@@ -56,8 +56,8 @@ To fix this, we have to make sure that step four never happens after step
 three. The ownership system in Rust does this through a concept called
 lifetimes, which describe the scope that a reference is valid for.
 
-When we have a function that takes an argument by reference, we can be
-implicit or explicit about the lifetime of the reference:
+When we have a function that takes a reference by argument, we can be implicit
+or explicit about the lifetime of the reference:
 
 ```rust
 // implicit

branches/try/src/libcollections/borrow.rs

@@ -49,18 +49,6 @@ pub trait ToOwned {
     type Owned: Borrow<Self>;
 
     /// Creates owned data from borrowed data, usually by cloning.
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```
-    /// let s = "a"; // &str
-    /// let ss = s.to_owned(); // String
-    ///
-    /// let v = &[1, 2]; // slice
-    /// let vv = v.to_owned(); // Vec
-    /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     fn to_owned(&self) -> Self::Owned;
 }

branches/try/src/libcore/ptr.rs

@@ -220,7 +220,7 @@ impl<T: ?Sized> *const T {
     /// ```
     /// let s: &str = "Follow the rabbit";
     /// let ptr: *const u8 = s.as_ptr();
-    /// assert!(!ptr.is_null());
+    /// assert!(ptr.is_null() == false);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
@@ -306,7 +306,7 @@ impl<T: ?Sized> *mut T {
     /// ```
     /// let mut s = [1, 2, 3];
     /// let ptr: *mut u32 = s.as_mut_ptr();
-    /// assert!(!ptr.is_null());
+    /// assert!(ptr.is_null() == false);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]

branches/try/src/librustc/lint/builtin.rs

@@ -144,7 +144,7 @@ declare_lint! {
 
 declare_lint! {
     pub ILLEGAL_STRUCT_OR_ENUM_CONSTANT_PATTERN,
-    Warn,
+    Deny,
     "constants of struct or enum type can only be used in a pattern if \
      the struct or enum has `#[derive(PartialEq, Eq)]`"
 }

branches/try/src/librustc_resolve/check_unused.rs

@@ -51,8 +51,16 @@ impl<'a, 'b, 'tcx:'b> DerefMut for UnusedImportCheckVisitor<'a, 'b, 'tcx> {
 
 impl<'a, 'b, 'tcx> UnusedImportCheckVisitor<'a, 'b, 'tcx> {
     // We have information about whether `use` (import) directives are actually
-    // used now. If an import is not used at all, we signal a lint error.
-    fn check_import(&mut self, id: ast::NodeId, span: Span) {
+    // used now. If an import is not used at all, we signal a lint error. If an
+    // import is only used for a single namespace, we remove the other namespace
+    // from the recorded privacy information. That means in privacy.rs, we will
+    // only check imports and namespaces which are used. In particular, this
+    // means that if an import could name either a public or private item, we
+    // will check the correct thing, dependent on how the import is used.
+    fn finalize_import(&mut self, id: ast::NodeId, span: Span) {
+        debug!("finalizing import uses for {:?}",
+               self.session.codemap().span_to_snippet(span));
+
         if !self.used_imports.contains(&(id, TypeNS)) &&
            !self.used_imports.contains(&(id, ValueNS)) {
             self.session.add_lint(lint::builtin::UNUSED_IMPORTS,
@@ -87,16 +95,23 @@ impl<'a, 'b, 'v, 'tcx> Visitor<'v> for UnusedImportCheckVisitor<'a, 'b, 'tcx> {
             hir::ItemUse(ref p) => {
                 match p.node {
                     ViewPathSimple(_, _) => {
-                        self.check_import(item.id, p.span)
+                        self.finalize_import(item.id, p.span)
                     }
 
                     ViewPathList(_, ref list) => {
                         for i in list {
-                            self.check_import(i.node.id(), i.span);
+                            self.finalize_import(i.node.id(), i.span);
                         }
                     }
                     ViewPathGlob(_) => {
-                        self.check_import(item.id, p.span)
+                        if !self.used_imports.contains(&(item.id, TypeNS)) &&
+                           !self.used_imports.contains(&(item.id, ValueNS)) {
+                            self.session
+                                .add_lint(lint::builtin::UNUSED_IMPORTS,
+                                          item.id,
+                                          p.span,
+                                          "unused import".to_string());
+                        }
                     }
                 }
             }

branches/try/src/libstd/collections/hash/map.rs

@@ -428,7 +428,10 @@ fn robin_hood<'a, K: 'a, V: 'a>(bucket: FullBucketMut<'a, K, V>,
                         mut val: V)
                         -> &'a mut V {
     let starting_index = bucket.index();
-    let size = bucket.table().size();
+    let size = {
+        let table = bucket.table(); // FIXME "lifetime too short".
+        table.size()
+    };
     // Save the *starting point*.
     let mut bucket = bucket.stash();
     // There can be at most `size - dib` buckets to displace, because
@@ -741,9 +744,10 @@ impl<K, V, S> HashMap<K, V, S>
                     let h = bucket.hash();
                     let (b, k, v) = bucket.take();
                     self.insert_hashed_ordered(h, k, v);
-                    if b.table().size() == 0 {
-                        break;
-                    }
+                    {
+                        let t = b.table(); // FIXME "lifetime too short".
+                        if t.size() == 0 { break }
+                    };
                     b.into_bucket()
                 }
                 Empty(b) => b.into_bucket()

branches/try/src/libstd/env.rs

@@ -181,7 +181,7 @@ fn _var(key: &OsStr) -> Result<String, VarError> {
 }
 
 /// Fetches the environment variable `key` from the current process, returning
-/// `None` if the variable isn't set.
+/// None if the variable isn't set.
 ///
 /// # Examples
 ///
@@ -617,7 +617,7 @@ pub mod consts {
     #[stable(feature = "env", since = "1.0.0")]
     pub const ARCH: &'static str = super::arch::ARCH;
 
-    /// The family of the operating system. Example value is `unix`.
+    /// The family of the operating system. In this case, `unix`.
     ///
     /// Some possible values:
     ///
@@ -626,8 +626,8 @@ pub mod consts {
     #[stable(feature = "env", since = "1.0.0")]
     pub const FAMILY: &'static str = super::os::FAMILY;
 
-    /// A string describing the specific operating system in use.
-    /// Example value is `linux`.
+    /// A string describing the specific operating system in use: in this
+    /// case, `linux`.
     ///
     /// Some possible values:
     ///
@@ -646,7 +646,7 @@ pub mod consts {
     pub const OS: &'static str = super::os::OS;
 
     /// Specifies the filename prefix used for shared libraries on this
-    /// platform. Example value is `lib`.
+    /// platform: in this case, `lib`.
     ///
     /// Some possible values:
     ///
@@ -656,7 +656,7 @@ pub mod consts {
     pub const DLL_PREFIX: &'static str = super::os::DLL_PREFIX;
 
     /// Specifies the filename suffix used for shared libraries on this
-    /// platform. Example value is `.so`.
+    /// platform: in this case, `.so`.
     ///
     /// Some possible values:
     ///
@@ -667,7 +667,7 @@ pub mod consts {
     pub const DLL_SUFFIX: &'static str = super::os::DLL_SUFFIX;
 
     /// Specifies the file extension used for shared libraries on this
-    /// platform that goes after the dot. Example value is `so`.
+    /// platform that goes after the dot: in this case, `so`.
     ///
     /// Some possible values:
     ///
@@ -678,7 +678,7 @@ pub mod consts {
     pub const DLL_EXTENSION: &'static str = super::os::DLL_EXTENSION;
 
     /// Specifies the filename suffix used for executable binaries on this
-    /// platform. Example value is `.exe`.
+    /// platform: in this case, the empty string.
     ///
     /// Some possible values:
     ///
@@ -690,7 +690,7 @@ pub mod consts {
     pub const EXE_SUFFIX: &'static str = super::os::EXE_SUFFIX;
 
     /// Specifies the file extension, if any, used for executable binaries
-    /// on this platform. Example value is `exe`.
+    /// on this platform: in this case, the empty string.
     ///
     /// Some possible values:
     ///

branches/try/src/libstd/fs.rs

@@ -1708,7 +1708,7 @@ mod tests {
         let tmpdir = tmpdir();
         let dir = &tmpdir.join("fileinfo_false_on_dir");
         check!(fs::create_dir(dir));
-        assert!(!dir.is_file());
+        assert!(dir.is_file() == false);
         check!(fs::remove_dir(dir));
     }
 

branches/try/src/libstd/primitive_docs.rs

@@ -425,10 +425,11 @@ mod prim_str { }
 ///
 /// # Trait implementations
 ///
-/// If every type inside a tuple implements one of the following
-/// traits, then a tuple itself also implements it.
+/// If every type inside a tuple implements one of the following traits, then a
+/// tuple itself also implements it.
 ///
 /// * [`Clone`]
+/// * [`Copy`]
 /// * [`PartialEq`]
 /// * [`Eq`]
 /// * [`PartialOrd`]
@@ -438,6 +439,7 @@ mod prim_str { }
 /// * [`Hash`]
 ///
 /// [`Clone`]: clone/trait.Clone.html
+/// [`Copy`]: marker/trait.Copy.html
 /// [`PartialEq`]: cmp/trait.PartialEq.html
 /// [`Eq`]: cmp/trait.Eq.html
 /// [`PartialOrd`]: cmp/trait.PartialOrd.html

branches/try/src/libsyntax/parse/parser.rs

@@ -1188,12 +1188,12 @@ impl<'a> Parser<'a> {
                             -> PResult<'a, TyKind> {
         /*
 
-        [unsafe] [extern "ABI"] fn (S) -> T
-         ^~~~^           ^~~~^     ^~^    ^
-           |               |        |     |
-           |               |        |   Return type
-           |               |      Argument types
-           |               |
+        [unsafe] [extern "ABI"] fn <'lt> (S) -> T
+         ^~~~^           ^~~~^     ^~~~^ ^~^    ^
+           |               |         |    |     |
+           |               |         |    |   Return type
+           |               |         |  Argument types
+           |               |     Lifetimes
            |              ABI
         Function Style
         */

branches/try/src/libtest/lib.rs

@@ -1509,7 +1509,7 @@ mod tests {
 
         assert_eq!(filtered.len(), 1);
         assert_eq!(filtered[0].desc.name.to_string(), "1");
-        assert!(!filtered[0].desc.ignore);
+        assert!(filtered[0].desc.ignore == false);
     }
 
     #[test]

branches/try/src/test/run-pass/specialization/specialization-cross-crate-defaults.rs

@@ -26,12 +26,12 @@ impl Foo for LocalOverride {
 }
 
 fn test_foo() {
-    assert!(!0i8.foo());
-    assert!(!0i32.foo());
-    assert!(0i64.foo());
+    assert!(0i8.foo() == false);
+    assert!(0i32.foo() == false);
+    assert!(0i64.foo() == true);
 
-    assert!(!LocalDefault.foo());
-    assert!(LocalOverride.foo());
+    assert!(LocalDefault.foo() == false);
+    assert!(LocalOverride.foo() == true);
 }
 
 fn test_bar() {

branches/try/src/test/run-pass/specialization/specialization-default-methods.rs

@@ -35,9 +35,9 @@ impl Foo for i64 {
 }
 
 fn test_foo() {
-    assert!(!0i8.foo());
-    assert!(!0i32.foo());
-    assert!(0i64.foo());
+    assert!(0i8.foo() == false);
+    assert!(0i32.foo() == false);
+    assert!(0i64.foo() == true);
 }
 
 // Next, test mixture of explicit `default` and provided methods: