Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup resolve #32240

Merged
merged 15 commits into from
Mar 26, 2016
Merged

Cleanup resolve #32240

merged 15 commits into from
Mar 26, 2016

Conversation

jseyfried
Copy link
Contributor

This is a collection of small refactorings and improvements in resolve, most of which could stand alone.
r? @nikomatsakis

@jseyfried
Copy link
Contributor Author

cc @petrochenkov

nikomatsakis
nikomatsakis reviewed Mar 25, 2016
View reviewed changes
src/librustc_resolve/lib.rs
/// let g = || {};
/// fn g() {}
/// g(); // This resolves to the local variable `g` since it shadows the item.
/// }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

love to see more comments! :)

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 25, 2016

📌 Commit fd2ac96 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 25, 2016

⌛ Testing commit fd2ac96 with merge 32737f7...

@bors
Copy link
Contributor

bors commented Mar 25, 2016

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

@jseyfried
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 25, 2016

📌 Commit 6d62f5b has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 26, 2016

☔ The latest upstream changes (presumably #32167) made this pull request unmergeable. Please resolve the merge conflicts.

@jseyfried
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 26, 2016

📌 Commit 4c22e2e has been approved by nikomatsakis

@Manishearth Manishearth mentioned this pull request Mar 26, 2016
Closed
bors added a commit that referenced this pull request Mar 26, 2016
@bors
Auto merge of #32495 - Manishearth:rollup, r=<try>
49312a4 
Rollup of 18 pull requests

- Successful merges: #32131, #32199, #32257, #32325, #32383, #32387, #32432, #32435, #32440, #32447, #32448, #32456, #32468, #32470, #32476, #32478, #32484, #32492
- Failed merges: #32240, #32469, #32482
@Manishearth Manishearth mentioned this pull request Mar 26, 2016
Merged
@Manishearth Manishearth reopened this Mar 26, 2016
bors added a commit that referenced this pull request Mar 26, 2016
@bors
Auto merge of #32496 - Manishearth:rollup, r=Manishearth
d322f99 
Rollup of 11 pull requests

- Successful merges: #32131, #32199, #32257, #32325, #32435, #32447, #32448, #32456, #32469, #32476, #32482
- Failed merges: #32240
@bors
Copy link
Contributor

bors commented Mar 26, 2016

🔒 Merge conflict

@bors
Copy link
Contributor

bors commented Mar 26, 2016

☔ The latest upstream changes (presumably #32496) made this pull request unmergeable. Please resolve the merge conflicts.

jseyfried added 13 commits March 26, 2016 18:22
@jseyfried
Avoid repeating parent
77f0f4a
@jseyfried
Make populate_module_if_necessary a method of resolver
0bed9ae
@jseyfried
Refactor away GraphBuilder
1744f55
@jseyfried
Replace uses of DefLike with Def (only the DlDef variant of `De…
07fecf8 
…fLike` was being used)
@jseyfried
Refactor out the common functionality of
7341785 
`resolve_item_in_lexical_scope` and `resolve_identifier_in_local_ribs` into
a new function `resolve_ident_in_lexical_scope`.
@jseyfried
Refactor away resolve_name_in_lexical_scope and `resolve_identifier…
bb09ae2 
…_in_local_ribs`.
@jseyfried
Avoid passing around the current module as an argument in `resolve_im…
43dffc3 
…ports`
@jseyfried
Refactor away resolve_import_for_module
8988c45
@jseyfried
Improve the error message for paths with too many initial supers
4b6b506
@jseyfried
Remove outdated comment
3e7a22e
@jseyfried
Remove an if statement with an condition that is always false
227cc5c
@jseyfried
Remove unnecessary pubs
60a836f
@jseyfried
Cleanup trait search
e011ae5
@jseyfried
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 26, 2016

📌 Commit e011ae5 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 26, 2016

⌛ Testing commit e011ae5 with merge 13bfd5c...

bors added a commit that referenced this pull request Mar 26, 2016
@bors
Auto merge of #32240 - jseyfried:cleanup_resolve, r=nikomatsakis
13bfd5c 
Cleanup resolve

This is a collection of small refactorings and improvements in `resolve`, most of which could stand alone.
r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Mar 26, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, 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-64-x-armhf, auto-linux-64-x-armsf, auto-linux-64-x-freebsd, auto-linux-64-x-netbsd, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-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-opt, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

@bors bors merged commit e011ae5 into rust-lang:master Mar 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jseyfried @nikomatsakis @bors @Manishearth