diff options
| author | bors <bors@rust-lang.org> | 2025-01-22 22:19:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-22 22:19:08 +0000 |
| commit | a30f9151fe4a841c4643af4e47ad18a23e1fb044 (patch) | |
| tree | 38f5de48919ef0899e06d133d16eec4e23b58868 /compiler/rustc_driver_impl/src | |
| parent | 649b995a9febd658b2570160703dff6fdc038ab2 (diff) | |
| parent | 3962bfaeedfc89260c0fb9d976489064f8becc02 (diff) | |
| download | rust-a30f9151fe4a841c4643af4e47ad18a23e1fb044.tar.gz rust-a30f9151fe4a841c4643af4e47ad18a23e1fb044.zip | |
Auto merge of #135896 - matthiaskrgr:rollup-g6rv7za, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #132983 (Edit dangling pointers ) - #135409 (Fix ICE-133117: multiple never-pattern arm doesn't have false_edge_start_block) - #135557 (Point at invalid utf-8 span on user's source code) - #135596 (Properly note when query stack is being cut off) - #135794 (Detect missing fields with default values and suggest `..`) - #135814 (ci: use ghcr buildkit image) - #135826 (Misc. `rustc_resolve` cleanups) - #135837 (Remove test panic from File::open) - #135856 (Library: Finalize dyn compatibility renaming) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_driver_impl/src')
| -rw-r--r-- | compiler/rustc_driver_impl/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs index 414d1205b0e..8b666c9100f 100644 --- a/compiler/rustc_driver_impl/src/lib.rs +++ b/compiler/rustc_driver_impl/src/lib.rs @@ -1528,9 +1528,9 @@ fn report_ice( // If backtraces are enabled, also print the query stack let backtrace = env::var_os("RUST_BACKTRACE").is_some_and(|x| &x != "0"); - let num_frames = if backtrace { None } else { Some(2) }; + let limit_frames = if backtrace { None } else { Some(2) }; - interface::try_print_query_stack(dcx, num_frames, file); + interface::try_print_query_stack(dcx, limit_frames, file); // We don't trust this callback not to panic itself, so run it at the end after we're sure we've // printed all the relevant info. |