Commit 155b46a

committed

Programmatically convert some of the pat ctors

1 parent dfc1bd7 commit 155b46aCopy full SHA for 155b46a

File tree

-13

lines changed

-13

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ fn clif_type_from_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<types::Typ`
`69`	`69`	`FloatTy::F128 => unimplemented!("f16_f128"),`
`70`	`70`	`},`
`71`	`71`	`ty::FnPtr(_) => pointer_ty(tcx),`
`72`		`- ty::RawPtr(TypeAndMut{ty:pointee_ty, mutbl: _ }) \| ty::Ref(_, pointee_ty, _) => {`
	`72`	`+ ty::RawPtr(pointee_ty, _) \| ty::Ref(_, pointee_ty, _) => {`
`73`	`73`	`if has_ptr_meta(tcx, *pointee_ty) {`
`74`	`74`	`return None;`
`75`	`75`	`} else {`
`@@ -89,7 +89,7 @@ fn clif_pair_type_from_ty<'tcx>(`
`89`	`89`	`ty::Tuple(types) if types.len() == 2 => {`
`90`	`90`	`(clif_type_from_ty(tcx, types[0])?, clif_type_from_ty(tcx, types[1])?)`
`91`	`91`	`}`
`92`		`- ty::RawPtr(TypeAndMut{ty:pointee_ty, mutbl: _ }) \| ty::Ref(_, pointee_ty, _) => {`
	`92`	`+ ty::RawPtr(pointee_ty, _) \| ty::Ref(_, pointee_ty, _) => {`
`93`	`93`	`if has_ptr_meta(tcx, *pointee_ty) {`
`94`	`94`	`(pointer_ty(tcx), pointer_ty(tcx))`
`95`	`95`	`} else {`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,8 @@ fn unsize_ptr<'tcx>(`
`70`	`70`	`) -> (Value, Value) {`
`71`	`71`	`match (&src_layout.ty.kind(), &dst_layout.ty.kind()) {`
`72`	`72`	`(&ty::Ref(_, a, _), &ty::Ref(_, b, _))`
`73`		`- \| (&ty::Ref(_, a, _), &ty::RawPtr(ty::TypeAndMut { ty: b, .. }))`
`74`		`- \| (&ty::RawPtr(ty::TypeAndMut { ty: a, .. }), &ty::RawPtr(ty::TypeAndMut { ty: b, .. })) => {`
`75`		`- (src, unsized_info(fx, a, b, old_info))`
`76`		`- }`
	`73`	`+ \| (&ty::Ref(_, a, _), &ty::RawPtr(b, _))`
	`74`	`+ \| (&ty::RawPtr(a, _), &ty::RawPtr(b, _)) => (src, unsized_info(fx, a, b, old_info)),`
`77`	`75`	`(&ty::Adt(def_a, _), &ty::Adt(def_b, _)) => {`
`78`	`76`	`assert_eq!(def_a, def_b);`
`79`	`77`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -865,15 +865,10 @@ pub(crate) fn assert_assignable<'tcx>(`
`865`	`865`	`return;`
`866`	`866`	`}`
`867`	`867`	`match (from_ty.kind(), to_ty.kind()) {`
`868`		`- (ty::Ref(_, a, _), ty::Ref(_, b, _))`
`869`		`- \| (`
`870`		`- ty::RawPtr(TypeAndMut { ty: a, mutbl: _ }),`
`871`		`- ty::RawPtr(TypeAndMut { ty: b, mutbl: _ }),`
`872`		`- ) => {`
	`868`	`+ (ty::Ref(_, a, _), ty::Ref(_, b, _)) \| (ty::RawPtr(a, _), ty::RawPtr(b, _)) => {`
`873`	`869`	`assert_assignable(fx, a, b, limit - 1);`
`874`	`870`	`}`
`875`		`- (ty::Ref(_, a, _), ty::RawPtr(TypeAndMut { ty: b, mutbl: _ }))`
`876`		`- \| (ty::RawPtr(TypeAndMut { ty: a, mutbl: _ }), ty::Ref(_, b, _)) => {`
	`871`	`+ (ty::Ref(_, a, _), ty::RawPtr(b, _)) \| (ty::RawPtr(a, _), ty::Ref(_, b, _)) => {`
`877`	`872`	`assert_assignable(fx, a, b, limit - 1);`
`878`	`873`	`}`
`879`	`874`	`(ty::FnPtr(_), ty::FnPtr(_)) => {`

Comments

(0)