mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rebase

Browse Source
This commit is contained in:
Esteban Küber 2022-11-23 12:15:22 -08:00
parent 0da4c44190
commit 78b8d126db
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_ast_lowering/src/expr.rs
View File

@ -136,7 +136,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
this.lower_block(body, false), this.lower_block(body, false),
this.lower_label(*opt_label), this.lower_label(*opt_label),
hir::LoopSource::Loop, hir::LoopSource::Loop,
this.lower_span(span), this.lower_span(*span),
) )
}), }),
ExprKind::TryBlock(body) => self.lower_expr_try_block(body), ExprKind::TryBlock(body) => self.lower_expr_try_block(body),

3
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View File

@ -740,8 +740,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
if infcx if infcx
.type_implements_trait( .type_implements_trait(
tcx.lang_items().clone_trait().unwrap(), tcx.lang_items().clone_trait().unwrap(),
tcx.erase_regions(ty), [tcx.erase_regions(ty)],
ty::List::empty(),
self.param_env, self.param_env,
) )
.must_apply_modulo_regions() .must_apply_modulo_regions()