Skip to content

Commit 0b62835

Browse files
authored
Rollup merge of #115373 - lqd:come-on-bors, r=compiler-errors
Fix bors missing a commit when merging #115355 bors incorrectly merged an outdated version of PR #115355 (via rollup #115370): - it [recorded r+](#115355 (comment)) as approving commit 325b585, and thus merged the original revision 7762ac7 - but the branch at the time was at commit eefa07d, so bors missed the `compiler/rustc_trait_selection/src/solve/search_graph/mod.rs` cleanup in commit 0e1e964 😓 Thankfully the change that bors missed was small, and this new PR corrects the situation (as I'd rather avoid having confusing multiple merge commits of PR #115355 in the git history) r? ``@compiler-errors``
2 parents 008c21c + 7272552 commit 0b62835

File tree

1 file changed

+1
-5
lines changed
  • compiler/rustc_trait_selection/src/solve/search_graph

1 file changed

+1
-5
lines changed

compiler/rustc_trait_selection/src/solve/search_graph/mod.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,9 @@ pub(super) struct SearchGraph<'tcx> {
5151

5252
impl<'tcx> SearchGraph<'tcx> {
5353
pub(super) fn new(tcx: TyCtxt<'tcx>, mode: SolverMode) -> SearchGraph<'tcx> {
54-
let local_overflow_limit = {
55-
let recursion_limit = tcx.recursion_limit().0;
56-
if recursion_limit == 0 { 0 } else { recursion_limit.ilog2() as usize }
57-
};
5854
Self {
5955
mode,
60-
local_overflow_limit,
56+
local_overflow_limit: tcx.recursion_limit().0.checked_ilog2().unwrap_or(0) as usize,
6157
stack: Default::default(),
6258
provisional_cache: ProvisionalCache::empty(),
6359
}

0 commit comments

Comments
 (0)