Skip to content

Fix popping singleton paths in when generating E0433 - #82259

Merged
bors merged 1 commit into
rust-lang:masterfrom
osa1:issue82156
Feb 19, 2021
Merged

Fix popping singleton paths in when generating E0433#82259
bors merged 1 commit into
rust-lang:masterfrom
osa1:issue82156

Conversation

@osa1

@osa1osa1 commented Feb 18, 2021

Copy link
Copy Markdown
Contributor

Fixes#82156

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

@rust-highfive

rust-highfive commented Feb 18, 2021

Copy link
Copy Markdown
Contributor

r? @matthewjasper

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 18, 2021
@jyn514

jyn514 commented Feb 18, 2021

Copy link
Copy Markdown
Member

r? @petrochenkov

@jyn514jyn514 added A-resolve Area: Name/path resolution done by `rustc_resolve` specifically 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

@Patryk27Patryk27 left a comment

Copy link
Copy Markdown
Contributor

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 🙂

Comment threadcompiler/rustc_resolve/src/late.rs Outdated
petrochenkov
petrochenkov reviewed Feb 18, 2021
View reviewed changes
Comment threadsrc/test/ui/issues/issue-82156.rs Outdated

@petrochenkovpetrochenkovFeb 18, 2021

Copy link
Copy Markdown
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?

@osa1osa1Feb 18, 2021

Copy link
Copy Markdown
ContributorAuthor

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.

@osa1osa1Feb 18, 2021

Copy link
Copy Markdown
ContributorAuthor

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'?

@petrochenkovpetrochenkovFeb 18, 2021

Copy link
Copy Markdown
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.

@petrochenkovpetrochenkov 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

osa1 commented Feb 18, 2021

Copy link
Copy Markdown
ContributorAuthor

@petrochenkov all done.

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

@rustbotrustbot 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

petrochenkov commented Feb 18, 2021

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Feb 18, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 9889e44 has been approved by petrochenkov

@borsbors 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-zzDylan-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 ofrust-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:masterFeb 19, 2021
@rustbotrustbot added this to the 1.52.0 milestone Feb 19, 2021
@osa1
osa1 deleted the issue82156 branch February 19, 2021 11:25
@jonas-schievinkjonas-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
@apirainoapiraino added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed stable-nominated Nominated for backporting to the compiler in the stable channel. labels Mar 4, 2021
@apiraino

apiraino commented Mar 4, 2021

Copy link
Copy Markdown
Contributor

beta nomination accepted, stable declined (zulip discussion)

@cuvipercuviper mentioned this pull request Mar 11, 2021
Merged
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 11, 2021
@cuvipercuviper modified the milestones: 1.52.0, 1.51.0Mar 11, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2021
@bors
Auto merge ofrust-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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments
+1 more reviewer
@Patryk27Patryk27Patryk27 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@petrochenkovpetrochenkov

Labels

A-resolveArea: Name/path resolution done by `rustc_resolve` specificallybeta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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()

11 participants

@osa1@rust-highfive@jyn514@petrochenkov@bors@apiraino@Patryk27@cuviper@jonas-schievink@matthewjasper@rustbot