Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bece740

Browse files
committedOct 4, 2024
Auto merge of #131269 - workingjubilee:rollup-bf7fzhf, r=workingjubilee
Rollup of 10 pull requests Successful merges: - #130453 (Add x86_64-unknown-trusty as tier 3 target) - #130518 (Stabilize the `map`/`value` methods on `ControlFlow`) - #131116 (Increase Stack Size for AIX) - #131171 (Fix `target_env` in `avr-unknown-gnu-atmega328`) - #131174 (Fix `target_abi` in `sparc-unknown-none-elf`) - #131177 ( Stabilize 5 `const_mut_refs`-dependent API) - #131238 (Remove mw from triagebot.toml) - #131240 (Fix typo in csky-unknown-linux-gnuabiv2.md) - #131257 ([rustdoc] Fix list margins) - #131264 (Fix some `pub(crate)` that were undetected bc of `#[instrument]`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 14f303b + 4778893 commit bece740

File tree

68 files changed

+159
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+159
-105
lines changed
 

‎compiler/rustc_borrowck/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![doc(rust_logo)]
66
#![feature(assert_matches)]
77
#![feature(box_patterns)]
8-
#![feature(control_flow_enum)]
98
#![feature(file_buffered)]
109
#![feature(let_chains)]
1110
#![feature(never_type)]

‎compiler/rustc_borrowck/src/renumber.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::BorrowckInferCtxt;
1111
/// Replaces all free regions appearing in the MIR with fresh
1212
/// inference variables, returning the number of variables created.
1313
#[instrument(skip(infcx, body, promoted), level = "debug")]
14-
pub fn renumber_mir<'tcx>(
14+
pub(crate) fn renumber_mir<'tcx>(
1515
infcx: &BorrowckInferCtxt<'tcx>,
1616
body: &mut Body<'tcx>,
1717
promoted: &mut IndexSlice<Promoted, Body<'tcx>>,

0 commit comments

Comments
 (0)
Please sign in to comment.