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

Fix popping singleton paths in when generating E0433 #82259

Merged
merged 1 commit into from
Feb 19, 2021
Merged

Fix popping singleton paths in when generating E0433 #82259

merged 1 commit into from
Feb 19, 2021

Conversation

osa1
Copy link
Contributor

@osa1 osa1 commented Feb 18, 2021

Fixes #82156

This was introduced with #72923, so pinging @Patryk27 for reviews.

@rust-highfive
Copy link
Collaborator

r? @matthewjasper

(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 Feb 18, 2021
@jyn514
Copy link
Member

jyn514 commented Feb 18, 2021

r? @petrochenkov

@jyn514 jyn514 added A-resolve Area: Path resolution T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 18, 2021
Patryk27
Patryk27 approved these changes Feb 18, 2021
View reviewed changes
Copy link
Contributor

@Patryk27 Patryk27 left a comment

Choose a reason for hiding this comment

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

Hah, I wouldn't have figured out super(); in the world 🙂

compiler/rustc_resolve/src/late.rs Outdated Show resolved Hide resolved
petrochenkov
petrochenkov reviewed Feb 18, 2021
View reviewed changes
src/test/ui/issues/issue-82156.rs Outdated
@@ -0,0 +1,3 @@
fn main() {
super(); //~ ERROR
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
super(); //~ ERROR
super(); //~ ERROR failed to resolve: there are too many leading `super` keywords

Could you also move this test from ui/issues to ui/resolve?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried adding this message but for some reason the test runner wouldn't accept it. I'll try again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@petrochenkov what is the difference between 'resolve' and 'issues'?

Copy link
Contributor

Choose a reason for hiding this comment

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

@osa1
Grouping tests into the issues subdirectory is meaningless.
The general idea is for test subdirectories to be related to specific compiler or language areas, so they could have "owners" from the corresponding maintainers and working groups.
Also see #73494 and related issues.

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 18, 2021
@osa1
Copy link
Contributor Author

osa1 commented Feb 18, 2021

@petrochenkov all done.

@rustbot label: +S-waiting-on-review -S-waiting-on-author

@rustbot rustbot 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 Feb 18, 2021
@petrochenkov
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 18, 2021

📌 Commit 9889e44 has been approved by petrochenkov

@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 Feb 18, 2021
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 19, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2021
@bors
Auto merge of rust-lang#82281 - Dylan-DPC:rollup-raob2tu, r=Dylan-DPC
8599bff 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#79747 (Add explanations and suggestions to `irrefutable_let_patterns` lint)
 - rust-lang#81496 (name async generators something more human friendly in type error diagnostic)
 - rust-lang#81873 (Add Mutex::unlock)
 - rust-lang#82093 (Add tests for Atomic*::fetch_{min,max})
 - rust-lang#82238 (ast: Keep expansion status for out-of-line module items)
 - rust-lang#82245 (Do not ICE when evaluating locals' types of invalid `yield`)
 - rust-lang#82259 (Fix popping singleton paths in when generating E0433)
 - rust-lang#82261 (rustdoc: Support argument files)
 - rust-lang#82274 (libtest: Fix unwrap panic on duplicate TestDesc)
 - rust-lang#82275 (Update cargo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit cc01bbe into rust-lang:master Feb 19, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 19, 2021
@osa1 osa1 deleted the issue82156 branch February 19, 2021 11:25
@jonas-schievink jonas-schievink added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Mar 1, 2021
@apiraino apiraino added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 4, 2021
@apiraino apiraino removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Mar 4, 2021
@apiraino
Copy link
Contributor

apiraino commented Mar 4, 2021

beta nomination accepted, stable declined (zulip discussion)

@cuviper cuviper mentioned this pull request Mar 11, 2021
Merged
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 11, 2021
@cuviper cuviper modified the milestones: 1.52.0, 1.51.0 Mar 11, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2021
@bors
Auto merge of rust-lang#82996 - cuviper:beta-next, r=Mark-Simulacrum
50b9553 
[beta] backports

This backports some beta-accepted PRs and one additional LLVM fix for s390x.

- rustdoc: treat edition 2021 as unstable rust-lang#82207
- Fix popping singleton paths in when generating E0433 rust-lang#82259
- libtest: Fix unwrap panic on duplicate TestDesc rust-lang#82274
- [intra-doc links] Don't check feature gates of items re-exported across crates rust-lang#82295
- rustdoc: Remove duplicate "List of all items" rust-lang#82484
- Substitute erased lifetimes on bad placeholder type rust-lang#82494
- Revert LLVM D81803 because it broke Windows 7 rust-lang#82605
- [SystemZ] Assign the full space for promoted and split outgoing args. rust-lang/llvm-project#95

r? `@Mark-Simulacrum`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@Patryk27 Patryk27 Patryk27 approved these changes

Assignees

@petrochenkov petrochenkov

Labels
A-resolve Area: Path resolution beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.

ICE instead of syntax error while calling super()