---

yaml
---
r: 39163
b: refs/heads/incoming
c: 0a3a2ee
h: refs/heads/master
i:
  39161: 096fe3b
  39159: 4504a27
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: f459acc45d97bb139a9694cf1f8f4fea0e9844f9
+refs/heads/incoming: 0a3a2eebfc4ecac7d43af86679ffc36eff83988c
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/resolve.rs

@@ -141,16 +141,16 @@ enum Namespace {
     ValueNS
 }
 
-/// A NamespaceResult represents the result of resolving an import in a
-/// particular namespace. The result is either definitely-resolved, definitely-
-/// unresolved, or unknown.
+/// A NamespaceResult represents the result of resolving an import in
+/// a particular namespace. The result is either definitely-resolved,
+/// definitely- unresolved, or unknown.
 enum NamespaceResult {
     /// Means that resolve hasn't gathered enough information yet to determine
     /// whether the name is bound in this namespace. (That is, it hasn't
     /// resolved all `use` directives yet.)
     UnknownResult,
-    /// Means that resolve has determined that the name is definitely not bound in
-    /// the namespace.
+    /// Means that resolve has determined that the name is definitely
+    /// not bound in the namespace.
     UnboundResult,
     /// Means that resolve has determined that the name is bound in the Module
     /// argument, and specified by the NameBindings argument.
@@ -1205,7 +1205,8 @@ impl Resolver {
                     self.build_reduced_graph_for_variant(*variant,
                         local_def(item.id),
                         // inherited => privacy of the enum item
-                        self.visibility_to_privacy(variant.node.vis, privacy == Public),
+                        self.visibility_to_privacy(variant.node.vis,
+                                                   privacy == Public),
                         new_parent, visitor);
                 }
             }