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.

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

diagnostics: Be clear about "crate root" and ::foo paths in resolve diagnostics #82881

Merged
merged 3 commits into from
Mar 9, 2021

Conversation

Manishearth
Copy link
Member

Various changes to make sure the diagnostics are clear about the differences in ::foo paths across editions:

  • ::foo will say "crate root" in 2015 and "list of imported crates" in 2018
  • crate:: will never reference imported crates in 2018

Fixes #82876

@rust-highfive
Copy link
Collaborator

r? @varkor

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 7, 2021
@Manishearth
Copy link
Member Author

@bors try

I ran most of the relevant tests but I probably missed something

@bors
Copy link
Contributor

bors commented Mar 7, 2021

⌛ Trying commit 249e84806f6f8854468dcfd35944034e5920c19e with merge 7cc1252e91642661873c8193c2d8b36284383347...

@rust-log-analyzer

This comment has been minimized.

@Manishearth
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Mar 7, 2021

⌛ Trying commit 0eeae1a with merge a4735d68b007154912ef3c8b5d978586d26e2643...

@bors
Copy link
Contributor

bors commented Mar 8, 2021

☀️ Try build successful - checks-actions
Build commit: a4735d68b007154912ef3c8b5d978586d26e2643 (a4735d68b007154912ef3c8b5d978586d26e2643)

@estebank
Copy link
Contributor

estebank commented Mar 8, 2021

r? @estebank
@bors r+

@bors
Copy link
Contributor

bors commented Mar 8, 2021

📌 Commit 0eeae1a has been approved by estebank

@rust-highfive rust-highfive assigned estebank and unassigned varkor Mar 8, 2021
@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 Mar 8, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 9, 2021
Rollup of 11 pull requests

Successful merges:

 - rust-lang#82711 (Add documentation for string->Cow conversions)
 - rust-lang#82767 (Update minifier dependency version)
 - rust-lang#82800 (Move rustdoc UI tests into a subdirectory)
 - rust-lang#82810 (Typo fix in Unstable book: `cargo cov` -> `cargo profdata`)
 - rust-lang#82829 (Handle negative literals in cast overflow warning)
 - rust-lang#82854 (Account for `if (let pat = expr) {}`)
 - rust-lang#82870 (Add note about the `#[doc(no-inline)]` usage)
 - rust-lang#82874 (Add codegen tests for some issues closed by LLVM 12)
 - rust-lang#82881 (diagnostics: Be clear about "crate root" and `::foo` paths in resolve diagnostics)
 - rust-lang#82888 (Grammar Fixes)
 - rust-lang#82897 ([.mailmap] Add entry for Ramkumar Ramachandra)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3908eec into rust-lang:master Mar 9, 2021
@rustbot rustbot added this to the 1.52.0 milestone Mar 9, 2021
@Manishearth Manishearth deleted the crate-root branch March 9, 2021 05:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ambiguous terminology "crate root"
7 participants