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.

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

Fix ICE due to unwrap in probe_for_name_many #126115

Merged
merged 1 commit into from
Jun 10, 2024

Conversation

gurry
Copy link
Contributor

@gurry gurry commented Jun 7, 2024

Fixes #125876

Now probe_for_name_many bubbles up the error returned by probe_op instead of calling unwrap on it.

@rustbot
Copy link
Collaborator

rustbot commented Jun 7, 2024

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Jun 7, 2024
@gurry gurry force-pushed the 125876-ice-unwrap-probe-many-result branch from 048a42d to 8a1d5b6 Compare June 7, 2024 09:01
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

Looks good, but also prefer let-else over unwrap_or(vec![])

compiler/rustc_hir_typeck/src/demand.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_typeck/src/method/suggest.rs Outdated Show resolved Hide resolved
@gurry gurry force-pushed the 125876-ice-unwrap-probe-many-result branch from 8a1d5b6 to 6d87fc8 Compare June 8, 2024 03:13
@compiler-errors
Copy link
Member

@bora r+ rollup

@gurry
Copy link
Contributor Author

gurry commented Jun 10, 2024

@bora r+ rollup

@compiler-errors bors got misspelt

@compiler-errors
Copy link
Member

whoops!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 10, 2024

📌 Commit 6d87fc8 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Jun 10, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 10, 2024
…-result, r=compiler-errors

Fix ICE due to `unwrap` in `probe_for_name_many`

Fixes rust-lang#125876

Now `probe_for_name_many` bubbles up the error returned by `probe_op` instead of calling `unwrap` on it.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 10, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#126036 (Migrate `run-make/short-ice` to `rmake`)
 - rust-lang#126063 (Remove some unused crate dependencies.)
 - rust-lang#126115 (Fix ICE due to `unwrap` in `probe_for_name_many`)
 - rust-lang#126159 (ScalarInt: size mismatches are a bug, do not delay the panic)
 - rust-lang#126184 (interpret: do not ICE on padded non-pow2 SIMD vectors)
 - rust-lang#126191 (Fix `NonZero` doctest inconsistencies)
 - rust-lang#126211 (migrate tests/run-make/llvm-outputs to use rmake.rs)
 - rust-lang#126212 (fix: build on haiku)
 - rust-lang#126215 (Add explanatory note to async block type mismatch error)
 - rust-lang#126223 (run-make: add `run_in_tmpdir` self-test)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 10, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#126063 (Remove some unused crate dependencies.)
 - rust-lang#126115 (Fix ICE due to `unwrap` in `probe_for_name_many`)
 - rust-lang#126159 (ScalarInt: size mismatches are a bug, do not delay the panic)
 - rust-lang#126184 (interpret: do not ICE on padded non-pow2 SIMD vectors)
 - rust-lang#126191 (Fix `NonZero` doctest inconsistencies)
 - rust-lang#126211 (migrate tests/run-make/llvm-outputs to use rmake.rs)
 - rust-lang#126212 (fix: build on haiku)
 - rust-lang#126215 (Add explanatory note to async block type mismatch error)
 - rust-lang#126223 (run-make: add `run_in_tmpdir` self-test)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bcc6fda into rust-lang:master Jun 10, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 10, 2024
Rollup merge of rust-lang#126115 - gurry:125876-ice-unwrap-probe-many-result, r=compiler-errors

Fix ICE due to `unwrap` in `probe_for_name_many`

Fixes rust-lang#125876

Now `probe_for_name_many` bubbles up the error returned by `probe_op` instead of calling `unwrap` on it.
@gurry gurry deleted the 125876-ice-unwrap-probe-many-result branch June 11, 2024 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

ICE: Result::unwrap() on an Err value: NoMatch(…)
5 participants