Skip to content

Fix ICE #90993: add missing call to cancel #90994

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Nov 21, 2021
Merged

Fix ICE #90993: add missing call to cancel #90994

merged 2 commits into from
Nov 21, 2021

Conversation

Badel2
Copy link
Contributor

@Badel2 Badel2 commented Nov 17, 2021

Fix #90993

@rust-highfive
Copy link
Contributor

r? @nagisa

(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 Nov 17, 2021
@rust-log-analyzer

This comment has been minimized.

# to view
@estebank
Copy link
Contributor

Can you move the test file to the parser subdirectory?

After that r=me.

r? @estebank

@rust-highfive rust-highfive assigned estebank and unassigned nagisa Nov 18, 2021
@apiraino apiraino added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 18, 2021
@Badel2
Copy link
Contributor Author

Badel2 commented Nov 18, 2021

Hi @estebank, which parser subdirectory? The test file is already in src/test/ui/parser/issue-90993.rs, but that gives an error: "following path contains more than 1005 entries"

@estebank
Copy link
Contributor

@Badel2 Ah! I see, misread the path.

Ok, could you create a new directory src/test/ui/parser/issues and move all the files starting with issue- in the parser directory into it? That can be on its own commit.

Sorry about the "unnecessary" busywork. Without these kinds of checks the test directories get unwieldy fast.

@Badel2
Fix ICE rust-lang#90993: add missing call to cancel
77a105c
@Badel2
Move parser tests to parser/issues subdirectory
8c8914e 
Because the parser directory has already reached the 1000 file limit.
@Badel2
Copy link
Contributor Author

Badel2 commented Nov 20, 2021

Alright, I moved all the issue- tests into a new issues/ folder. I also had to move the auxiliary folder because otherwise 2 tests did fail.

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 20, 2021

📌 Commit 8c8914e has been approved by estebank

@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 Nov 20, 2021
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 20, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2021
@bors
Auto merge of rust-lang#91093 - matthiaskrgr:rollup-kovzwx0, r=matthi…
5bc9807 
…askrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#89741 (Mark `Arc::from_inner` / `Rc::from_inner` as unsafe)
 - rust-lang#90927 (Fix float ICE)
 - rust-lang#90994 (Fix ICE `rust-lang#90993`: add missing call to cancel)
 - rust-lang#91018 (Adopt let_else in more places in rustc_mir_build)
 - rust-lang#91022 (Suggest `await` in more situations where infer types are involved)
 - rust-lang#91088 (Revert "require full validity when determining the discriminant of a value")

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3d4f3ee into rust-lang:master Nov 21, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 21, 2021
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@estebank estebank

Labels
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.58.0
Development

Successfully merging this pull request may close these issues.

internal compiler error: the following error was constructed but not emitted: unexpected token: .
8 participants
@Badel2 @rust-highfive @rust-log-analyzer @estebank @bors @nagisa @apiraino @rustbot