Skip to content

Rename PathResolution to PartialRes#60544

Merged
bors merged 3 commits intorust-lang:masterfrom
petrochenkov:parder
May 5, 2019
Merged

Rename PathResolution to PartialRes#60544
bors merged 3 commits intorust-lang:masterfrom
petrochenkov:parder

Conversation

@petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented May 4, 2019 •
edited
Loading

Don't use PartialRes when Res is enough.
Rename Res::kind_name to Res::descr for consistency.
Remove Res::Label, paths can never resolve to labels.

Some further cleanup after #60462
r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 4, 2019
@petrochenkov
Remove Res::Label
7da9250 
Paths can never resolve to labels
@eddyb
Copy link
Member

eddyb commented May 4, 2019

This is looking nicer by the day ☺️

@bors r+

@bors
Copy link
Collaborator

bors commented May 4, 2019

📌 Commit 0824082ed3ad2b6d7d02423522f24c2bda1bc128 has been approved by eddyb

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2019
@petrochenkov
Copy link
Contributor Author

petrochenkov commented May 4, 2019

@eddyb
Oops, I've just pushed one more commit.

@petrochenkov
Copy link
Contributor Author

petrochenkov commented May 4, 2019

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 4, 2019
@petrochenkov petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 4, 2019
eddyb
eddyb reviewed May 4, 2019
View reviewed changes
src/librustc/hir/def.rs
@@ -142,7 +142,6 @@ pub enum Res<Id = hir::HirId> {
Upvar(Id, // `HirId` of closed over local
usize, // index in the `freevars` list of the closure
ast::NodeId), // expr node that creates the closure
Copy link
Member

@eddyb eddyb May 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Btw, I've started a branch removing Res::Upvar just in case you wanted to do that too.

@eddyb
Copy link
Member

eddyb commented May 4, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented May 4, 2019

📌 Commit 7da9250 has been approved by eddyb

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2019
@bors
Copy link
Collaborator

bors commented May 5, 2019

⌛ Testing commit 7da9250 with merge ee142165308d6bd1709d8e1108571643e4606994...

@bors
Copy link
Collaborator

bors commented May 5, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Contributor

rust-highfive commented May 5, 2019

The job dist-x86_64-linux-alt of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
travis_time:end:179b71a2:start=1557054867967037487,finish=1557054867976827177,duration=9789690
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:07e4844f
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:04784cf2
travis_time:start:04784cf2
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0eaedaa9
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 5, 2019
@petrochenkov
Copy link
Contributor Author

petrochenkov commented May 5, 2019

failed to get 200 response from https://static.crates.io/crates/pretty_env_logger/pretty_env_logger-0.3.0.crate, got 504

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 5, 2019
@bors
Copy link
Collaborator

bors commented May 5, 2019

⌛ Testing commit 7da9250 with merge 5d8fd98...

bors added a commit that referenced this pull request May 5, 2019
@bors
Auto merge of #60544 - petrochenkov:parder, r=eddyb
5d8fd98 
Rename `PathResolution` to `PartialRes`

Don't use `PartialRes` when `Res` is enough.
Rename `Res::kind_name` to `Res::descr` for consistency.
Remove `Res::Label`, paths can never resolve to labels.

Some further cleanup after #60462
r? @eddyb
@bors
Copy link
Collaborator

bors commented May 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: eddyb
Pushing 5d8fd98 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2019
@bors bors merged commit 7da9250 into rust-lang:master May 5, 2019
This was referenced May 5, 2019
Closed
Merged
@petrochenkov petrochenkov deleted the parder branch June 5, 2019 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@eddyb eddyb eddyb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@eddyb eddyb

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@petrochenkov @eddyb @bors @rust-highfive