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 emit_unused_delims_expr ICE #104433

Merged
merged 2 commits into from
Nov 18, 2022
Merged

Fix emit_unused_delims_expr ICE #104433

merged 2 commits into from
Nov 18, 2022

Conversation

TaKO8Ki
Copy link
Member

@TaKO8Ki TaKO8Ki commented Nov 15, 2022

Fixes #104392

@rustbot
Copy link
Collaborator

rustbot commented Nov 15, 2022

r? @lcnr

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot 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. labels Nov 15, 2022
TaKO8Ki
TaKO8Ki commented Nov 15, 2022
View reviewed changes
compiler/rustc_lint/src/unused.rs
let end = block.stmts[block.stmts.len() - 1].span;
if let Some(start) = start.find_ancestor_inside(value.span)
&& let Some(end) = end.find_ancestor_inside(value.span)
ast::ExprKind::Block(ref block, None) if block.stmts.len() == 1 => {
Copy link
Member Author

@TaKO8Ki TaKO8Ki Nov 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

According to the following comment, the block always has just one statement.

rust/compiler/rustc_lint/src/unused.rs

Lines 992 to 998 in 101e182

// emit a warning under the following conditions:
//
// - the block does not have a label
// - the block is not `unsafe`
// - the block contains exactly one expression (do not lint `{ expr; }`)
// - `followed_by_block` is true and the internal expr may contain a `{`
// - the block is not multiline (do not lint multiline match arms)

@estebank
Copy link
Contributor

r? @estebank
@bors r+

@bors
Copy link
Contributor

bors commented Nov 17, 2022

📌 Commit 1cf4132 has been approved by estebank

It is now in the queue for this repository.

@rustbot rustbot assigned estebank and unassigned lcnr Nov 17, 2022
@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 17, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 17, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2022
@bors
Auto merge of rust-lang#104555 - matthiaskrgr:rollup-tncyca8, r=matth…
9d46c7a 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#103852 (Don't remap early-bound regions for return-position `impl Trait` in trait originating from `impl`)
 - rust-lang#104366 (Simplify settings theme choice)
 - rust-lang#104433 (Fix `emit_unused_delims_expr` ICE)
 - rust-lang#104444 (Fix ICE in in_operand for ty error)
 - rust-lang#104483 (Convert predicates into Predicate in the Obligation constructor)
 - rust-lang#104496 (Don't attempt to normalize compiler backtraces)
 - rust-lang#104503 (rustdoc: remove redundant font-color CSS on `.where`)
 - rust-lang#104508 (Check `dyn*` return type correctly)
 - rust-lang#104515 (ICE fixing, remove is_tainted_by_errors since we have ty_error for delay bug)
 - rust-lang#104532 (Migrate tooltip style to CSS variables)
 - rust-lang#104545 (Readd the matches_macro diag item)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c9ccb0b into rust-lang:master Nov 18, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 18, 2022
@TaKO8Ki TaKO8Ki deleted the fix-104392 branch November 28, 2022 03:45
@TaKO8Ki TaKO8Ki mentioned this pull request Nov 28, 2022
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 6, 2022
@matthiaskrgr
Rollup merge of rust-lang#105004 - TaKO8Ki:fix-104897, r=wesleywiser
b29a4f9 
Fix `emit_unused_delims_expr` ICE

Fixes rust-lang#104897

This is also related to rust-lang#104433.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.67.0
Development

Successfully merging this pull request may close these issues.

ice: "Span must not be empty and have no suggestion"
5 participants
@TaKO8Ki @rustbot @estebank @bors @lcnr