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

diagnostics: Describe crate root modules in DefKind::Mod as "crate" #63250

Merged
merged 2 commits into from
Aug 11, 2019
Merged

diagnostics: Describe crate root modules in DefKind::Mod as "crate" #63250

merged 2 commits into from
Aug 11, 2019

Conversation

petrochenkov
Copy link
Contributor

Or we can use "extern crate" like resolve previously did sometimes, not sure.

r? @davidtwco

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 3, 2019
davidtwco
davidtwco approved these changes Aug 4, 2019
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

Looks good to me! One or two of the changes are minor regressions (IMO - some of the changes from extern crate to crate) but overall I think this is an improvement.

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 4, 2019

📌 Commit 50b258b has been approved by davidtwco

@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 Aug 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 5, 2019
@Centril
Rollup merge of rust-lang#63250 - petrochenkov:descrate, r=davidtwco
e690f35 
diagnostics: Describe crate root modules in `DefKind::Mod` as "crate"

Or we can use "extern crate" like resolve previously did sometimes, not sure.

r? @davidtwco
@Centril Centril mentioned this pull request Aug 5, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019
@Centril
Rollup merge of rust-lang#63250 - petrochenkov:descrate, r=davidtwco
d7eab18 
diagnostics: Describe crate root modules in `DefKind::Mod` as "crate"

Or we can use "extern crate" like resolve previously did sometimes, not sure.

r? @davidtwco
@Centril Centril mentioned this pull request Aug 6, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019
@Centril
Rollup merge of rust-lang#63250 - petrochenkov:descrate, r=davidtwco
dc1b568 
diagnostics: Describe crate root modules in `DefKind::Mod` as "crate"

Or we can use "extern crate" like resolve previously did sometimes, not sure.

r? @davidtwco
@Centril Centril mentioned this pull request Aug 6, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Aug 6, 2019

Failed in #63318 (comment) (due to cargo making assumption about error message; see https://dev.azure.com/rust-lang/e71b0ddf-dd27-435a-873c-e30f86eea377/_apis/build/builds/5242/logs/1000).

@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 Aug 6, 2019
@petrochenkov petrochenkov mentioned this pull request Aug 9, 2019
Merged
@petrochenkov
Copy link
Contributor Author

Blocked on rust-lang/cargo#7231.

@petrochenkov petrochenkov added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 9, 2019
bors added a commit to rust-lang/cargo that referenced this pull request Aug 9, 2019
@bors
Auto merge of #7231 - petrochenkov:module2crate, r=alexcrichton
e853aa9 
Update two tests for changes in rustc output

Required for landing rust-lang/rust#63250.

(I'm not sure what is the process for landing synchronous changes like this.)
@bors
Copy link
Contributor

bors commented Aug 10, 2019

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

@petrochenkov petrochenkov added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Aug 10, 2019
@petrochenkov
Copy link
Contributor Author

Blocked on #63400.

@petrochenkov
Copy link
Contributor Author

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Aug 10, 2019

📌 Commit 26d26eb has been approved by davidtwco

@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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Aug 10, 2019
@petrochenkov
Copy link
Contributor Author

petrochenkov commented Aug 10, 2019 •
edited
Loading

Cargo updated.
r? @ehuss

@rust-highfive rust-highfive assigned ehuss and unassigned davidtwco Aug 10, 2019
@bors
Copy link
Contributor

bors commented Aug 10, 2019

⌛ Testing commit 26d26eb with merge 8fd7df6...

bors added a commit that referenced this pull request Aug 10, 2019
@bors
Auto merge of #63250 - petrochenkov:descrate, r=davidtwco
8fd7df6 
diagnostics: Describe crate root modules in `DefKind::Mod` as "crate"

Or we can use "extern crate" like resolve previously did sometimes, not sure.

r? @davidtwco
@bors
Copy link
Contributor

bors commented Aug 11, 2019

☀️ Test successful - checks-azure
Approved by: davidtwco
Pushing 8fd7df6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 11, 2019
@bors bors merged commit 26d26eb into rust-lang:master Aug 11, 2019
@bors bors mentioned this pull request Aug 11, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@ehuss ehuss

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.
6 participants
@petrochenkov @davidtwco @bors @Centril @ehuss @rust-highfive