resolve: cleanup and groundwork for resolving the AST by jseyfried · Pull Request #33232 · rust-lang/rust

jseyfried · 2016-04-27T06:44:18Z

Cleanup resolve and refactor away uses of the hir map (incorrectly named ast_map).
r? @nrc

…ath` to return a `NameBinding` instead of a `Def`

Refactor `ty::Visibility` methods to use a new trait `NodeIdTree` instead of the ast map.

jseyfried · 2016-04-27T06:48:09Z

nrc · 2016-04-27T18:02:43Z

+ loop {
+ if node_ancestor == ancestor { return true }
+ let node_ancestor_parent = self.get_module_parent(node_ancestor);
+ if node_ancestor_parent == node_ancestor { return false }


style nit: spread these ifs over three lines

nrc · 2016-04-27T19:10:35Z

Nice! r+ with the style nits addressed.

jseyfried · 2016-04-27T23:48:18Z

@nrc thanks for the quick review! I addressed the style nits in the above commit.

nrc · 2016-04-28T01:51:51Z

prefer true rather than return true;

and in the other function too

jseyfried · 2016-04-28T03:50:32Z

@nrc

prefer true rather than return true;

Whoops -- didn't notice that when mechanically refactoring, fixed.

nrc · 2016-04-28T09:52:28Z

@bors: r+

bors · 2016-04-28T09:52:47Z

📌 Commit ac26419 has been approved by nrc

bors · 2016-04-29T05:28:49Z

⌛ Testing commit ac26419 with merge cc1b031...

bors · 2016-04-29T06:33:59Z

💔 Test failed - auto-win-msvc-64-opt

alexcrichton · 2016-04-29T06:41:29Z

@bors: retry

On Thu, Apr 28, 2016 at 11:34 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-msvc-64-opt
http://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt/builds/4010
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub
#33232 (comment)

bors · 2016-04-29T09:53:20Z

⌛ Testing commit ac26419 with merge b2bc29d...

bors · 2016-04-29T12:06:33Z

💔 Test failed - auto-mac-32-opt

alexcrichton · 2016-04-29T15:10:50Z

@bors: retry

On Friday, April 29, 2016, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-mac-32-opt
http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/8981
—
You are receiving this because you commented.
Reply to this email directly or view it on GitHub
#33232 (comment)

bors · 2016-04-29T16:02:36Z

⌛ Testing commit ac26419 with merge 8b1dcf4...

@nrc

resolve: cleanup and groundwork for resolving the AST Cleanup `resolve` and refactor away uses of the hir map (incorrectly named `ast_map`). r? @nrc

bors · 2016-04-29T18:18:17Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

jseyfried added 8 commits April 26, 2016 09:01

Refactor away field vis of ModuleS
c46164b

Refactor field span of NameBinding from Option<Span> to Span.
c9d8e14

Refactor away FallbackChecks and remove dead code
2ccaeed

Refactor away is_static_method
82e0dd5

Refactor away get_trait_name
6da1153

Refactor resolve_crate_relative_path and `resolve_module_relative_p…
3bcf818
…ath` to return a `NameBinding` instead of a `Def`

Refactor away a use of ast_map.span_if_local()
33bb269

Avoid using the hir map when visibility checking in resolve
6aa9145
Refactor `ty::Visibility` methods to use a new trait `NodeIdTree` instead of the ast map.

rust-highfive assigned nrc Apr 27, 2016

nrc reviewed Apr 27, 2016
View reviewed changes

nrc reviewed Apr 28, 2016
View reviewed changes

Address style nits
ac26419

jseyfried force-pushed the resolve_ast_groundwork branch from 28a2f7e to ac26419Compare April 28, 2016 03:46

jseyfried closed this Apr 28, 2016

jseyfried reopened this Apr 28, 2016

bors added a commit that referenced this pull request Apr 29, 2016
Auto merge of#33232- jseyfried:resolve_ast_groundwork, r=nrc
8b1dcf4
resolve: cleanup and groundwork for resolving the AST Cleanup `resolve` and refactor away uses of the hir map (incorrectly named `ast_map`). r? @nrc

bors mentioned this pull request Apr 29, 2016
Make BTreeSet::Insert docs more consistent #33276
Merged

bors merged commit ac26419 into rust-lang:masterApr 29, 2016

This was referenced Apr 29, 2016
resolve: improve diagnostics and lay groundwork for resolving before ast->hir #33190
Merged
Warn unused trait imports, rebased #33091
Merged

Uh oh!

Uh oh!

Conversation

jseyfried commented Apr 27, 2016

Uh oh!

jseyfried commented Apr 27, 2016

Uh oh!

nrcApr 27, 2016

Choose a reason for hiding this comment

Uh oh!

jseyfriedApr 27, 2016

Choose a reason for hiding this comment

Uh oh!

nrc commented Apr 27, 2016

Uh oh!

jseyfried commented Apr 27, 2016

Uh oh!

nrcApr 28, 2016

Choose a reason for hiding this comment

Uh oh!

nrcApr 28, 2016

Choose a reason for hiding this comment

Uh oh!

jseyfried commented Apr 28, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nrc commented Apr 28, 2016

Uh oh!

bors commented Apr 28, 2016

Uh oh!

bors commented Apr 29, 2016

Uh oh!

bors commented Apr 29, 2016

Uh oh!

alexcrichton commented Apr 29, 2016

Uh oh!

bors commented Apr 29, 2016

Uh oh!

bors commented Apr 29, 2016

Uh oh!

alexcrichton commented Apr 29, 2016

Uh oh!

bors commented Apr 29, 2016

Uh oh!

bors commented Apr 29, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jseyfried commented Apr 28, 2016•
edited
Loading