Skip to content

resolve: diagnostics improvement and groundwork for RFC 1560#35116

Merged
bors merged 9 commits into
rust-lang:masterfrom
jseyfried:groundwork_for_new_import_semantics
Aug 6, 2016
Merged

resolve: diagnostics improvement and groundwork for RFC 1560#35116
bors merged 9 commits into
rust-lang:masterfrom
jseyfried:groundwork_for_new_import_semantics

Conversation

@jseyfried

@jseyfried jseyfried commented Jul 29, 2016 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes #35115, fixes #35135, and lays groundwork for #32213 (cc #35120).
r? @nrc

@jseyfried jseyfried changed the title resolve: diagnostics improvement and groundwork for item_like_imports resolve: diagnostics improvement and groundwork for RFC 1560 Jul 29, 2016
@jseyfried

jseyfried commented Jul 29, 2016

Copy link
Copy Markdown
Contributor Author

cc @petrochenkov

@jseyfried jseyfried force-pushed the groundwork_for_new_import_semantics branch 2 times, most recently from 9b5eeae to 6750e63 Compare July 29, 2016 19:59
@bors

bors commented Jul 30, 2016

Copy link
Copy Markdown
Collaborator

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

@jseyfried jseyfried force-pushed the groundwork_for_new_import_semantics branch 2 times, most recently from e340634 to 1fc60db Compare July 31, 2016 21:59
nrc
nrc reviewed Aug 1, 2016
View reviewed changes
Comment thread src/librustc_resolve/resolve_imports.rs Outdated

@nrc nrc Aug 1, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I feel dirty just reviewing this code - I really wish we didn't use Deref like this in name resolution. Still the damage is done, I guess this doesn't make things much worse.

@nrc

nrc commented Aug 1, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Aug 1, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 1fc60db has been approved by nrc

@bors

bors commented Aug 1, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1fc60db with merge e7aff48...

@bors

bors commented Aug 1, 2016

Copy link
Copy Markdown
Collaborator

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

@sanxiyn

sanxiyn commented Aug 1, 2016

Copy link
Copy Markdown
Contributor

cargotest failure is legit. (This PR produced additional unused import warnings in cargo which is denied.)

@bors

bors commented Aug 1, 2016

Copy link
Copy Markdown
Collaborator

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

@jseyfried jseyfried mentioned this pull request Aug 1, 2016
Merged
bors added a commit to rust-lang/cargo that referenced this pull request Aug 1, 2016
@bors
Auto merge of #2942 - jseyfried:remove_unused_import, r=alexcrichton
9ef9bd7 
Remove unused import

c.f. rust-lang/rust#35116
@jseyfried jseyfried force-pushed the groundwork_for_new_import_semantics branch from 1fc60db to bc77bdc Compare August 1, 2016 19:11
@jseyfried

jseyfried commented Aug 1, 2016

Copy link
Copy Markdown
Contributor Author

@bors r=nrc

@bors

bors commented Aug 1, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit bc77bdc has been approved by nrc

@sanxiyn

sanxiyn commented Aug 2, 2016

Copy link
Copy Markdown
Contributor

FYI, you need to explicitly update commit hash in src/tools/cargotest/main.rs.

@bors

bors commented Aug 2, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bc77bdc with merge 2b24fef...

@bors

bors commented Aug 2, 2016

Copy link
Copy Markdown
Collaborator

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

@jseyfried

jseyfried commented Aug 3, 2016

Copy link
Copy Markdown
Contributor Author

@sanxiyn Thanks -- didn't know that!
I updated the cargo_test hash in the above commit.

@bors r=nrc

@bors

bors commented Aug 3, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 93ab4c6 has been approved by nrc

@bors

bors commented Aug 4, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 93ab4c6 with merge 7a331fc...

@bors

bors commented Aug 4, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-64-cargotest

@jseyfried jseyfried force-pushed the groundwork_for_new_import_semantics branch from 93ab4c6 to de5eaab Compare August 5, 2016 19:28
@jseyfried

jseyfried commented Aug 5, 2016

Copy link
Copy Markdown
Contributor Author

@bors r=nrc

@bors

bors commented Aug 5, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit de5eaab has been approved by nrc

@bors

bors commented Aug 5, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit de5eaab with merge 7bf54f9...

bors added a commit that referenced this pull request Aug 5, 2016
@bors
Auto merge of #35116 - jseyfried:groundwork_for_new_import_semantics,…
7bf54f9 
… r=nrc

resolve: diagnostics improvement and groundwork for RFC 1560

Fixes #35115, fixes #35135, and lays groundwork for #32213 (cc #35120).
r? @nrc
@bors

bors commented Aug 6, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-64-debug-opt

@jseyfried

jseyfried commented Aug 6, 2016

Copy link
Copy Markdown
Contributor Author

@bors retry

@bors

bors commented Aug 6, 2016

Copy link
Copy Markdown
Collaborator

⚡ Previous build results for auto-linux-32-nopt-t, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-opt, auto-linux-64-opt-no-mir, auto-linux-64-opt-rustbuild, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt-rustbuild, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt-no-mir, auto-win-msvc-64-opt-rustbuild are reusable. Rebuilding only auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-x-android-t, auto-mac-32-opt, auto-win-gnu-32-opt, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt...

@bors

bors commented Aug 6, 2016

Copy link
Copy Markdown
Collaborator

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-no-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-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-no-mir, auto-win-msvc-64-opt-rustbuild
Approved by: nrc
Pushing 7bf54f9 to master...

@bors bors merged commit de5eaab into rust-lang:master Aug 6, 2016
@bors bors mentioned this pull request Aug 6, 2016
Merged
@jseyfried jseyfried deleted the groundwork_for_new_import_semantics branch October 16, 2016 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nrc nrc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

resolve: suboptimal unused import detection resolve: "bindings cannot shadow constants" diagnostics are unreliable

4 participants

@jseyfried @bors @nrc @sanxiyn