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

Check var scope if it exist #94849

Merged
merged 1 commit into from
Apr 15, 2022
Merged

Check var scope if it exist #94849

merged 1 commit into from
Apr 15, 2022

Conversation

ouz-a
Copy link
Contributor

@ouz-a ouz-a commented Mar 11, 2022

Fixes #92893.

Added helper function to check the scope of a variable, if it doesn't have a scope call delay_span_bug, which avoids us trying to get a block/scope that doesn't exist.

Had to increase ROOT_ENTRY_LIMIT was getting tidy error

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 11, 2022
@rust-highfive
Copy link
Collaborator

r? @matthewjasper

(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 Mar 11, 2022
@bors
Copy link
Contributor

bors commented Mar 21, 2022

☔ The latest upstream changes (presumably #95180) made this pull request unmergeable. Please resolve the merge conflicts.

@TaKO8Ki
Copy link
Member

TaKO8Ki commented Mar 23, 2022

r? @rust-lang/compiler

compiler/rustc_middle/src/middle/region.rs Outdated Show resolved Hide resolved
compiler/rustc_mir_build/src/build/matches/mod.rs Outdated Show resolved Hide resolved
@nikomatsakis
Copy link
Contributor

This looks like it's targeting const generics?

r? @oli-obk or reassign

@rust-highfive rust-highfive assigned oli-obk and unassigned jackh726 Mar 23, 2022
@ouz-a
Copy link
Contributor Author

ouz-a commented Mar 24, 2022

Clippy no longer compiles, should I make changes on Clippy too?

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Mar 30, 2022

☔ The latest upstream changes (presumably #94081) made this pull request unmergeable. Please resolve the merge conflicts.

@apiraino
Copy link
Contributor

@ouz-a could you please check the CI and and flip back the label to s-waiting-on-review when done? Thanks!

@rustbot author

@rustbot rustbot 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 Apr 14, 2022
@ouz-a ouz-a closed this Apr 14, 2022
@ouz-a ouz-a reopened this Apr 14, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Apr 14, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Apr 14, 2022

📌 Commit c20bb1d has been approved by oli-obk

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 14, 2022
@ouz-a
Copy link
Contributor Author

ouz-a commented Apr 14, 2022

After a long battle with git I think I won 🥇 ICE is solved.

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 14, 2022
fee1-dead added a commit to fee1-dead-contrib/rust that referenced this pull request Apr 15, 2022
Check var scope if it exist

Fixes rust-lang#92893.

Added helper function to check the scope of a variable, if it doesn't have a scope call delay_span_bug, which avoids us trying to get a block/scope that doesn't exist.

Had to increase `ROOT_ENTRY_LIMIT` was getting tidy error
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 15, 2022
Check var scope if it exist

Fixes rust-lang#92893.

Added helper function to check the scope of a variable, if it doesn't have a scope call delay_span_bug, which avoids us trying to get a block/scope that doesn't exist.

Had to increase `ROOT_ENTRY_LIMIT` was getting tidy error
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 15, 2022
Rollup of 11 pull requests

Successful merges:

 - rust-lang#94457 (Stabilize `derive_default_enum`)
 - rust-lang#94461 (Create (unstable) 2024 edition)
 - rust-lang#94849 (Check var scope if it exist)
 - rust-lang#95194 (remove find_use_placement)
 - rust-lang#95749 (only downgrade selection Error -> Ambiguous if type error is in predicate)
 - rust-lang#96026 (couple of clippy::complexity fixes)
 - rust-lang#96027 (remove function parameters only used in recursion)
 - rust-lang#96034 ([test] Add test cases of untested functions for BTreeSet )
 - rust-lang#96040 (Use u32 instead of i32 for futexes.)
 - rust-lang#96062 (docs: Update tests chapter for Termination stabilization)
 - rust-lang#96065 (Refactor: Use `format-args-capture` and remove unnecessary nested blocks in rustc_typeck)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a32e0f3 into rust-lang:master Apr 15, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 15, 2022
flip1995 pushed a commit to flip1995/rust that referenced this pull request Apr 21, 2022
Check var scope if it exist

Fixes rust-lang#92893.

Added helper function to check the scope of a variable, if it doesn't have a scope call delay_span_bug, which avoids us trying to get a block/scope that doesn't exist.

Had to increase `ROOT_ENTRY_LIMIT` was getting tidy error
@ouz-a ouz-a deleted the master4 branch July 26, 2023 12:56
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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error: internal compiler error: compiler/rustc_middle/src/middle/region.rs:377:32: no enclosing scope for id 6