nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline a trivial function

Browse Source
This commit is contained in:
Oli Scherer 2022-05-18 15:09:14 +00:00
parent 759c04a00b
commit 96b819a456
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_infer/src/infer/outlives/obligations.rs
View File

@ -343,7 +343,7 @@ where
// These are guaranteed to apply, no matter the inference // These are guaranteed to apply, no matter the inference
// results. // results.
let trait_bounds: Vec<_> = let trait_bounds: Vec<_> =
self.verify_bound.projection_declared_bounds_from_trait(projection_ty).collect(); self.verify_bound.bounds(projection_ty.item_def_id, projection_ty.substs).collect();
debug!(?trait_bounds); debug!(?trait_bounds);
@ -369,7 +369,7 @@ where
match *bound.0.kind() { match *bound.0.kind() {
ty::Projection(projection_ty) => self ty::Projection(projection_ty) => self
.verify_bound .verify_bound
.projection_declared_bounds_from_trait(projection_ty) .bounds(projection_ty.item_def_id, projection_ty.substs)
.all(|r| r != bound.1), .all(|r| r != bound.1),
_ => panic!("expected only projection types from env, not {:?}", bound.0), _ => panic!("expected only projection types from env, not {:?}", bound.0),

34
compiler/rustc_infer/src/infer/outlives/verify.rs
View File

@ -6,7 +6,7 @@ use rustc_data_structures::captures::Captures;
use rustc_data_structures::sso::SsoHashSet; use rustc_data_structures::sso::SsoHashSet;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_middle::ty::GenericArg; use rustc_middle::ty::GenericArg;
use rustc_middle::ty::{self, EarlyBinder, OutlivesPredicate, Ty, TyCtxt}; use rustc_middle::ty::{self, EarlyBinder, OutlivesPredicate, SubstsRef, Ty, TyCtxt};
use smallvec::smallvec; use smallvec::smallvec;
@ -114,16 +114,6 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
self.declared_generic_bounds_from_env_for_erased_ty(erased_projection_ty) self.declared_generic_bounds_from_env_for_erased_ty(erased_projection_ty)
} }
/// Searches the where-clauses in scope for regions that
/// `projection_ty` is known to outlive. Currently requires an
/// exact match.
pub fn projection_declared_bounds_from_trait(
&self,
projection_ty: ty::ProjectionTy<'tcx>,
) -> impl Iterator<Item = ty::Region<'tcx>> + 'cx + Captures<'tcx> {
self.declared_projection_bounds_from_trait(projection_ty)
}
#[instrument(level = "debug", skip(self, visited))] #[instrument(level = "debug", skip(self, visited))]
fn projection_bound( fn projection_bound(
&self, &self,
@ -151,7 +141,7 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
// Extend with bounds that we can find from the trait. // Extend with bounds that we can find from the trait.
let trait_bounds = self let trait_bounds = self
.projection_declared_bounds_from_trait(projection_ty) .bounds(projection_ty.item_def_id, projection_ty.substs)
.map(|r| VerifyBound::OutlivedBy(r)); .map(|r| VerifyBound::OutlivedBy(r));
// see the extensive comment in projection_must_outlive // see the extensive comment in projection_must_outlive
@ -294,15 +284,15 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
/// ///
/// then this function would return `'x`. This is subject to the /// then this function would return `'x`. This is subject to the
/// limitations around higher-ranked bounds described in /// limitations around higher-ranked bounds described in
/// `region_bounds_declared_on_associated_item`. /// `declared_region_bounds`.
fn declared_projection_bounds_from_trait( #[instrument(level = "debug", skip(self))]
pub fn bounds(
&self, &self,
projection_ty: ty::ProjectionTy<'tcx>, def_id: DefId,
substs: SubstsRef<'tcx>,
) -> impl Iterator<Item = ty::Region<'tcx>> + 'cx + Captures<'tcx> { ) -> impl Iterator<Item = ty::Region<'tcx>> + 'cx + Captures<'tcx> {
debug!("projection_bounds(projection_ty={:?})", projection_ty);
let tcx = self.tcx; let tcx = self.tcx;
self.region_bounds_declared_on_associated_item(projection_ty.item_def_id) self.declared_region_bounds(def_id).map(move |r| EarlyBinder(r).subst(tcx, substs))
.map(move |r| EarlyBinder(r).subst(tcx, projection_ty.substs))
} }
/// Given the `DefId` of an associated item, returns any region /// Given the `DefId` of an associated item, returns any region
@ -335,12 +325,10 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
/// ///
/// This is for simplicity, and because we are not really smart /// This is for simplicity, and because we are not really smart
/// enough to cope with such bounds anywhere. /// enough to cope with such bounds anywhere.
fn region_bounds_declared_on_associated_item( fn declared_region_bounds(&self, def_id: DefId) -> impl Iterator<Item = ty::Region<'tcx>> {
&self,
assoc_item_def_id: DefId,
) -> impl Iterator<Item = ty::Region<'tcx>> {
let tcx = self.tcx; let tcx = self.tcx;
let bounds = tcx.item_bounds(assoc_item_def_id); let bounds = tcx.item_bounds(def_id);
trace!("{:#?}", bounds);
bounds bounds
.into_iter() .into_iter()
.filter_map(|p| p.to_opt_type_outlives()) .filter_map(|p| p.to_opt_type_outlives())