Review suggestions
This commit is contained in:
parent
98f30e833a
commit
8d3c90ae13
@ -363,11 +363,11 @@ pub fn read_immediate_raw(
|
||||
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),
|
||||
|
@ -1368,22 +1368,20 @@ 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
|
||||
.decl
|
||||
.inputs
|
||||
.get(pos)
|
||||
.map(|arg| {
|
||||
if pos == 0 {
|
||||
arg.span
|
||||
} else {
|
||||
arg.span.with_lo(impl_m_sig.decl.inputs[0].span.lo())
|
||||
}
|
||||
})
|
||||
.unwrap_or(impl_m_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);
|
||||
let impl_span = impl_m_sig
|
||||
.decl
|
||||
.inputs
|
||||
.get(pos)
|
||||
.map(|arg| {
|
||||
if pos == 0 {
|
||||
arg.span
|
||||
} else {
|
||||
arg.span.with_lo(impl_m_sig.decl.inputs[0].span.lo())
|
||||
}
|
||||
})
|
||||
.unwrap_or(impl_m_span);
|
||||
|
||||
let mut err = struct_span_err!(
|
||||
tcx.sess,
|
||||
|
@ -230,7 +230,7 @@ fn try_fold_ty(&mut self, ty: Ty<'tcx>) -> Result<Ty<'tcx>, Self::Error> {
|
||||
if concrete_ty == ty {
|
||||
bug!(
|
||||
"infinite recursion generic_ty: {:#?}, substs: {:#?}, \
|
||||
concrete_ty: {:#?}, ty: {:#?}",
|
||||
concrete_ty: {:#?}, ty: {:#?}",
|
||||
generic_ty,
|
||||
substs,
|
||||
concrete_ty,
|
||||
|
Loading…
Reference in New Issue
Block a user