---

yaml
---
r: 274741
b: refs/heads/stable
c: d881eee
h: refs/heads/master
i:
  274739: 51e43bf

Author: jseyfried

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 16e7ff1bffea9f1b4c9f016989081286b32a1ec7
+refs/heads/stable: d881eee608bcfcd89643cb126c9f3aefc6a80661
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_resolve/build_reduced_graph.rs

@@ -100,16 +100,16 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
     fn try_define<T>(&self, parent: Module<'b>, name: Name, ns: Namespace, def: T)
         where T: ToNameBinding<'b>
     {
-        parent.try_define_child(name, ns, self.new_name_binding(def.to_name_binding()));
+        let _ = parent.try_define_child(name, ns, self.new_name_binding(def.to_name_binding()));
     }
 
     /// Defines `name` in namespace `ns` of module `parent` to be `def` if it is not yet defined;
     /// otherwise, reports an error.
     fn define<T: ToNameBinding<'b>>(&self, parent: Module<'b>, name: Name, ns: Namespace, def: T) {
         let binding = self.new_name_binding(def.to_name_binding());
         let old_binding = match parent.try_define_child(name, ns, binding) {
-            Some(old_binding) => old_binding,
-            None => return,
+            Ok(()) => return,
+            Err(old_binding) => old_binding,
         };
 
         let span = binding.span.unwrap_or(DUMMY_SP);

branches/stable/src/librustc_resolve/lib.rs

@@ -870,10 +870,10 @@ impl<'a> ModuleS<'a> {
     // If the name is not yet defined, define the name and return None.
     // Otherwise, return the existing definition.
     fn try_define_child(&self, name: Name, ns: Namespace, binding: &'a NameBinding<'a>)
-                        -> Option<&'a NameBinding<'a>> {
+                        -> Result<(), &'a NameBinding<'a>> {
         match self.children.borrow_mut().entry((name, ns)) {
-            hash_map::Entry::Vacant(entry) => { entry.insert(binding); None }
-            hash_map::Entry::Occupied(entry) => { Some(entry.get()) },
+            hash_map::Entry::Vacant(entry) => { entry.insert(binding); Ok(()) }
+            hash_map::Entry::Occupied(entry) => { Err(entry.get()) },
         }
     }