nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract copy bound check into a function

Browse Source
This commit is contained in:
Oli Scherer 2022-04-29 18:49:02 +00:00
parent 018f9347fc
commit be54947315
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/rustc_typeck/src/check/expr.rs
View File

@ -1292,6 +1292,18 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
return tcx.ty_error();
}
self.check_repeat_element_needs_copy_bound(element, count, element_ty);
tcx.mk_ty(ty::Array(t, count))
}
fn check_repeat_element_needs_copy_bound(
&self,
element: &hir::Expr<'_>,
count: ty::Const<'tcx>,
element_ty: Ty<'tcx>,
) {
let tcx = self.tcx;
let is_const = match &element.kind {
hir::ExprKind::ConstBlock(..) => true,
hir::ExprKind::Path(qpath) => {
@ -1303,7 +1315,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
_ => false,
};
if !is_const {
let is_const_fn = match element.kind {
hir::ExprKind::Call(func, _args) => match *self.node_ty(func.hir_id).kind() {
@ -1319,8 +1330,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.require_type_meets(element_ty, element.span, code, lang_item);
}
}
tcx.mk_ty(ty::Array(t, count))
}
fn check_expr_tuple(