Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 73a7423

Browse files
committedFeb 17, 2022
Auto merge of rust-lang#94103 - matthiaskrgr:rollup-cd70ofn, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#93337 (Update tracking issue numbers for inline assembly sub-features) - rust-lang#93758 (Improve comments about type folding/visiting.) - rust-lang#93780 (Generate list instead of div items in sidebar) - rust-lang#93976 (Add MAIN_SEPARATOR_STR) - rust-lang#94011 (Even more let_else adoptions) - rust-lang#94041 (Add a `try_collect()` helper method to `Iterator`) - rust-lang#94043 (Fix ICE when using Box<T, A> with pointer sized A) - rust-lang#94082 (Remove CFG_PLATFORM) - rust-lang#94085 (Clippy: Don't lint `needless_borrow` in method receiver positions) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 30b3f35 + 39c1748 commit 73a7423

File tree

67 files changed

+499
-416
lines changed

Some content is hidden

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

67 files changed

+499
-416
lines changed
 

‎compiler/rustc_borrowck/src/diagnostics/bound_region_errors.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,9 @@ trait TypeOpInfo<'tcx> {
142142
let tcx = mbcx.infcx.tcx;
143143
let base_universe = self.base_universe();
144144

145-
let adjusted_universe = if let Some(adjusted) =
145+
let Some(adjusted_universe) =
146146
placeholder.universe.as_u32().checked_sub(base_universe.as_u32())
147-
{
148-
adjusted
149-
} else {
147+
else {
150148
mbcx.buffer_error(self.fallback_error(tcx, cause.span));
151149
return;
152150
};

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -867,15 +867,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
867867
kind: TerminatorKind::Call { fn_span, from_hir_call, .. }, ..
868868
}) = &self.body[location.block].terminator
869869
{
870-
let (method_did, method_substs) = if let Some(info) =
870+
let Some((method_did, method_substs)) =
871871
rustc_const_eval::util::find_self_call(
872872
self.infcx.tcx,
873873
&self.body,
874874
target_temp,
875875
location.block,
876-
) {
877-
info
878-
} else {
876+
)
877+
else {
879878
return normal_ret;
880879
};
881880

0 commit comments

Comments
 (0)
This repository has been archived.