Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
Badel2:issue-90993
Nov 21, 2021
Merged

Fix ICE #90993: add missing call to cancel#90994
bors merged 2 commits into
rust-lang:masterfrom
Badel2:issue-90993

Conversation

@Badel2

@Badel2Badel2 commented Nov 17, 2021

Copy link
Copy Markdown
Contributor

@rust-highfive

rust-highfive commented Nov 17, 2021

Copy link
Copy Markdown
Contributor

r? @nagisa

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

This comment has been minimized.

Sign in to view
@estebank

estebank commented Nov 18, 2021

Copy link
Copy Markdown
Contributor

Can you move the test file to the parser subdirectory?

After that r=me.

r? @estebank

@rust-highfiverust-highfive assigned estebank and unassigned nagisaNov 18, 2021
@apirainoapiraino 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

Badel2 commented Nov 18, 2021

Copy link
Copy Markdown
ContributorAuthor

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

estebank commented Nov 19, 2021

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

Badel2 commented Nov 20, 2021

Copy link
Copy Markdown
ContributorAuthor

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

estebank commented Nov 20, 2021

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 20, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 8c8914e has been approved by estebank

@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 Nov 20, 2021
@matthiaskrgrmatthiaskrgr 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 ofrust-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:masterNov 21, 2021
@rustbotrustbot added this to the 1.58.0 milestone Nov 21, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@estebankestebank

Labels

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.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