bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move nll_relate to relate::nll submodule

Browse source
This commit is contained in:
Michael Goulet 2023-12-15 16:02:33 +00:00
parent 807cd85dfa
commit 0184c7616e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,7 @@ use self::region_constraints::{
RegionConstraintCollector, RegionConstraintStorage, RegionSnapshot, RegionConstraintCollector, RegionConstraintStorage, RegionSnapshot,
}; };
pub use self::relate::combine::CombineFields; pub use self::relate::combine::CombineFields;
pub use self::relate::nll as nll_relate;
use self::type_variable::{TypeVariableOrigin, TypeVariableOriginKind}; use self::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
pub mod at; pub mod at;
@ -60,7 +61,6 @@ pub mod free_regions;
mod freshen; mod freshen;
mod fudge; mod fudge;
mod lexical_region_resolve; mod lexical_region_resolve;
pub mod nll_relate;
pub mod opaque_types; pub mod opaque_types;
pub mod outlives; pub mod outlives;
mod projection; mod projection;

4
compiler/rustc_infer/src/infer/relate/mod.rs
View file

@ -1,6 +1,5 @@
//! This module contains the definitions of most `TypeRelation`s in the type system //! This module contains the definitions of most `TypeRelation`s in the type system
//! (except for the NLL `TypeRelating`, and some relations used for diagnostics //! (except for some relations used for diagnostics and heuristics in the compiler).
//! and heuristics in the compiler).
pub(super) mod combine; pub(super) mod combine;
mod equate; mod equate;
@ -9,4 +8,5 @@ mod glb;
mod higher_ranked; mod higher_ranked;
mod lattice; mod lattice;
mod lub; mod lub;
pub mod nll;
mod sub; mod sub;

4
compiler/rustc_infer/src/infer/nll_relate/mod.rs → compiler/rustc_infer/src/infer/relate/nll.rs
View file

@ -30,8 +30,8 @@ use rustc_middle::ty::{self, InferConst, Ty, TyCtxt};
use rustc_span::{Span, Symbol}; use rustc_span::{Span, Symbol};
use std::fmt::Debug; use std::fmt::Debug;
use super::relate::combine::ObligationEmittingRelation; use super::combine::ObligationEmittingRelation;
use super::relate::generalize::{self, Generalization}; use super::generalize::{self, Generalization};
use crate::infer::InferCtxt; use crate::infer::InferCtxt;
use crate::infer::{TypeVariableOrigin, TypeVariableOriginKind}; use crate::infer::{TypeVariableOrigin, TypeVariableOriginKind};
use crate::traits::{Obligation, PredicateObligations}; use crate::traits::{Obligation, PredicateObligations};