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

Check namespaces when resolving associated items in typeck #45297

Merged
merged 1 commit into from
Oct 16, 2017
Merged

Check namespaces when resolving associated items in typeck #45297

merged 1 commit into from
Oct 16, 2017

Conversation

matthewjasper
Copy link
Contributor

Closes #35600
Closes #44247
Fixes a "cannot move a value of type..." error in the same case as #44247 but with the associated items swapped.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

kennytm
kennytm reviewed Oct 15, 2017
View reviewed changes
src/librustc_typeck/check/method/probe.rs Outdated
})
.collect()
} else {
self.fcx.associated_item(def_id, name).map_or(Vec::new(), |x| vec![x])
self.fcx.associated_item(def_id, name, Namespace::Value).map_or(Vec::new(), |x| vec![x])
Copy link
Member

Choose a reason for hiding this comment

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

This line is too long.

[00:03:58] tidy error: /checkout/src/librustc_typeck/check/method/probe.rs:1326: line longer than 100 chars

@matthewjasper matthewjasper force-pushed the associated-item-namespaces branch from cf71357 to 9845e09 Compare October 15, 2017 09:28
@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 15, 2017
@matthewjasper matthewjasper force-pushed the associated-item-namespaces branch from 9845e09 to 3f30f9e Compare October 15, 2017 10:02
@matthewjasper matthewjasper force-pushed the associated-item-namespaces branch from 3f30f9e to b522ee1 Compare October 15, 2017 10:58
@kennytm kennytm 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 Oct 15, 2017
@petrochenkov
Copy link
Contributor

This is great, two less issues on my backlog! :)
@bors r+

@bors
Copy link
Contributor

bors commented Oct 15, 2017

📌 Commit b522ee1 has been approved by petrochenkov

@kennytm kennytm 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 Oct 15, 2017
@bors
Copy link
Contributor

bors commented Oct 16, 2017

⌛ Testing commit b522ee1 with merge abe7c87...

bors added a commit that referenced this pull request Oct 16, 2017
@bors
Auto merge of #45297 - matthewjasper:associated-item-namespaces, r=pe…
abe7c87 
…trochenkov

Check namespaces when resolving associated items in typeck

Closes #35600
Closes #44247
Fixes a "cannot move a value of type..." error in the same case as #44247 but with the associated items swapped.
@bors
Copy link
Contributor

bors commented Oct 16, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing abe7c87 to master...

@bors bors merged commit b522ee1 into rust-lang:master Oct 16, 2017
This was referenced Oct 16, 2017
Merged
Merged
@matthewjasper matthewjasper deleted the associated-item-namespaces branch October 22, 2017 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm approved these changes

Assignees

@petrochenkov petrochenkov

Labels
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.
6 participants
@matthewjasper @rust-highfive @petrochenkov @bors @kennytm @pnkfelix