bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Review suggestions

Browse source
This commit is contained in:
Maybe Waffle 2023-01-14 06:29:16 +00:00
parent 98f30e833a
commit 8d3c90ae13
3 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_const_eval/src/interpret/operand.rs
View file

@ -363,11 +363,11 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
src: &OpTy<'tcx, M::Provenance>,
) -> InterpResult<'tcx, Either<MPlaceTy<'tcx, M::Provenance>, ImmTy<'tcx, M::Provenance>>> {
Ok(match src.as_mplace_or_imm() {
Left(mplace) => {
if let Some(val) = self.read_immediate_from_mplace_raw(&mplace)? {
Left(ref mplace) => {
if let Some(val) = self.read_immediate_from_mplace_raw(mplace)? {
Right(val)
} else {
Left(mplace)
Left(*mplace)
}
}
Right(val) => Right(val),

6
compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
View file

@ -1368,10 +1368,9 @@ fn compare_number_of_method_arguments<'tcx>(
})
.or(trait_item_span);
let impl_span = {
let ImplItemKind::Fn(impl_m_sig, _) = &tcx.hir().expect_impl_item(impl_m.def_id.expect_local()).kind else { bug!("{:?} is not a method", impl_m) };
let pos = impl_number_args.saturating_sub(1);
impl_m_sig
let impl_span = impl_m_sig
.decl
.inputs
.get(pos)
@ -1382,8 +1381,7 @@ fn compare_number_of_method_arguments<'tcx>(
arg.span.with_lo(impl_m_sig.decl.inputs[0].span.lo())
}
})
.unwrap_or(impl_m_span)
};
.unwrap_or(impl_m_span);
let mut err = struct_span_err!(
tcx.sess,