Skip to content

Commit 939990d

Browse files
committed
---
yaml --- r: 37779 b: refs/heads/try c: 0a3a2ee h: refs/heads/master i: 37777: 82ef78b 37775: c5ae01f v: v3
1 parent 8db2cb1 commit 939990d

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: f459acc45d97bb139a9694cf1f8f4fea0e9844f9
5+
refs/heads/try: 0a3a2eebfc4ecac7d43af86679ffc36eff83988c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,16 @@ enum Namespace {
141141
ValueNS
142142
}
143143

144-
/// A NamespaceResult represents the result of resolving an import in a
145-
/// particular namespace. The result is either definitely-resolved, definitely-
146-
/// unresolved, or unknown.
144+
/// A NamespaceResult represents the result of resolving an import in
145+
/// a particular namespace. The result is either definitely-resolved,
146+
/// definitely- unresolved, or unknown.
147147
enum NamespaceResult {
148148
/// Means that resolve hasn't gathered enough information yet to determine
149149
/// whether the name is bound in this namespace. (That is, it hasn't
150150
/// resolved all `use` directives yet.)
151151
UnknownResult,
152-
/// Means that resolve has determined that the name is definitely not bound in
153-
/// the namespace.
152+
/// Means that resolve has determined that the name is definitely
153+
/// not bound in the namespace.
154154
UnboundResult,
155155
/// Means that resolve has determined that the name is bound in the Module
156156
/// argument, and specified by the NameBindings argument.
@@ -1205,7 +1205,8 @@ impl Resolver {
12051205
self.build_reduced_graph_for_variant(*variant,
12061206
local_def(item.id),
12071207
// inherited => privacy of the enum item
1208-
self.visibility_to_privacy(variant.node.vis, privacy == Public),
1208+
self.visibility_to_privacy(variant.node.vis,
1209+
privacy == Public),
12091210
new_parent, visitor);
12101211
}
12111212
}

0 commit comments

Comments
 (0)