bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove box syntax from rustc_infer

Browse source
This commit is contained in:
est31 2021-08-05 04:43:06 +02:00
parent 489744f900
commit 15672dc695
5 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_infer/src/infer/equate.rs
View file

@ -105,7 +105,7 @@ impl TypeRelation<'tcx> for Equate<'combine, 'infcx, 'tcx> {
b: ty::Region<'tcx>, b: ty::Region<'tcx>,
) -> RelateResult<'tcx, ty::Region<'tcx>> { ) -> RelateResult<'tcx, ty::Region<'tcx>> {
debug!("{}.regions({:?}, {:?})", self.tag(), a, b); debug!("{}.regions({:?}, {:?})", self.tag(), a, b);
let origin = Subtype(box self.fields.trace.clone()); let origin = Subtype(Box::new(self.fields.trace.clone()));
self.fields self.fields
.infcx .infcx
.inner .inner

2
compiler/rustc_infer/src/infer/glb.rs
View file

@ -67,7 +67,7 @@ impl TypeRelation<'tcx> for Glb<'combine, 'infcx, 'tcx> {
) -> RelateResult<'tcx, ty::Region<'tcx>> { ) -> RelateResult<'tcx, ty::Region<'tcx>> {
debug!("{}.regions({:?}, {:?})", self.tag(), a, b); debug!("{}.regions({:?}, {:?})", self.tag(), a, b);
let origin = Subtype(box self.fields.trace.clone()); let origin = Subtype(Box::new(self.fields.trace.clone()));
Ok(self.fields.infcx.inner.borrow_mut().unwrap_region_constraints().glb_regions( Ok(self.fields.infcx.inner.borrow_mut().unwrap_region_constraints().glb_regions(
self.tcx(), self.tcx(),
origin, origin,

2
compiler/rustc_infer/src/infer/lub.rs
View file

@ -67,7 +67,7 @@ impl TypeRelation<'tcx> for Lub<'combine, 'infcx, 'tcx> {
) -> RelateResult<'tcx, ty::Region<'tcx>> { ) -> RelateResult<'tcx, ty::Region<'tcx>> {
debug!("{}.regions({:?}, {:?})", self.tag(), a, b); debug!("{}.regions({:?}, {:?})", self.tag(), a, b);
let origin = Subtype(box self.fields.trace.clone()); let origin = Subtype(Box::new(self.fields.trace.clone()));
Ok(self.fields.infcx.inner.borrow_mut().unwrap_region_constraints().lub_regions( Ok(self.fields.infcx.inner.borrow_mut().unwrap_region_constraints().lub_regions(
self.tcx(), self.tcx(),
origin, origin,

2
compiler/rustc_infer/src/infer/sub.rs
View file

@ -142,7 +142,7 @@ impl TypeRelation<'tcx> for Sub<'combine, 'infcx, 'tcx> {
// FIXME -- we have more fine-grained information available // FIXME -- we have more fine-grained information available
// from the "cause" field, we could perhaps give more tailored // from the "cause" field, we could perhaps give more tailored
// error messages. // error messages.
let origin = SubregionOrigin::Subtype(box self.fields.trace.clone()); let origin = SubregionOrigin::Subtype(Box::new(self.fields.trace.clone()));
self.fields self.fields
.infcx .infcx
.inner .inner

1
compiler/rustc_infer/src/lib.rs
View file

@ -15,7 +15,6 @@
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")] #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(bool_to_option)] #![feature(bool_to_option)]
#![feature(box_patterns)] #![feature(box_patterns)]
#![feature(box_syntax)]
#![feature(extend_one)] #![feature(extend_one)]
#![feature(iter_zip)] #![feature(iter_zip)]
#![feature(never_type)] #![feature(never_type)]