mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

obligation cause: RepeatVec -> RepeatValueCopy

Browse source
This commit is contained in:
lcnr 2022-03-31 12:50:53 +02:00
parent e730969b0d
commit d7cada1767
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_borrowck/src/type_check/mod.rs
View file

@ -1899,7 +1899,9 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
ObligationCause::new( ObligationCause::new(
span, span,
self.tcx().hir().local_def_id_to_hir_id(def_id), self.tcx().hir().local_def_id_to_hir_id(def_id),
traits::ObligationCauseCode::RepeatVec(is_const_fn), traits::ObligationCauseCode::RepeatElementCopy {
is_const_fn,
},
), ),
self.param_env, self.param_env,
ty::Binder::dummy(ty::TraitRef::new( ty::Binder::dummy(ty::TraitRef::new(

11
compiler/rustc_middle/src/traits/mod.rs
View file

@ -236,11 +236,12 @@ pub enum ObligationCauseCode<'tcx> {
SizedBoxType, SizedBoxType,
/// Inline asm operand type must be `Sized`. /// Inline asm operand type must be `Sized`.
InlineAsmSized, InlineAsmSized,
/// `[T, ..n]` implies that `T` must be `Copy`. /// `[expr; N]` requires `type_of(expr): Copy`.
/// If the function in the array repeat expression is a `const fn`, RepeatElementCopy {
/// display a help message suggesting to move the function call to a /// If element is a `const fn` we display a help message suggesting to move the
/// new `const` item while saying that `T` doesn't implement `Copy`. /// function call to a new `const` item while saying that `T` doesn't implement `Copy`.
RepeatVec(bool), is_const_fn: bool,
},
/// Types of fields (other than the last, except for packed structs) in a struct must be sized. /// Types of fields (other than the last, except for packed structs) in a struct must be sized.
FieldSized { FieldSized {

2
compiler/rustc_mir_build/src/thir/pattern/mod.rs
View file

@ -198,7 +198,7 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> {
let kind = match pat.kind { let kind = match pat.kind {
hir::PatKind::Wild => PatKind::Wild, hir::PatKind::Wild => PatKind::Wild,
hir::PatKind::Lit(ref value) => self.lower_lit(value), hir::PatKind::Lit(value) => self.lower_lit(value),
hir::PatKind::Range(ref lo_expr, ref hi_expr, end) => { hir::PatKind::Range(ref lo_expr, ref hi_expr, end) => {
let (lo_expr, hi_expr) = (lo_expr.as_deref(), hi_expr.as_deref()); let (lo_expr, hi_expr) = (lo_expr.as_deref(), hi_expr.as_deref());

2
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -1988,7 +1988,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
ObligationCauseCode::Coercion { source: _, target } => { ObligationCauseCode::Coercion { source: _, target } => {
err.note(&format!("required by cast to type `{}`", self.ty_to_string(target))); err.note(&format!("required by cast to type `{}`", self.ty_to_string(target)));
} }
ObligationCauseCode::RepeatVec(is_const_fn) => { ObligationCauseCode::RepeatElementCopy { is_const_fn } => {
err.note( err.note(
"the `Copy` trait is required because the repeated element will be copied", "the `Copy` trait is required because the repeated element will be copied",
); );