From 0184c7616e0c898a6c69d67d16febbb9124305d1 Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Fri, 15 Dec 2023 16:02:33 +0000
Subject: [PATCH] Move nll_relate to relate::nll submodule

---
 compiler/rustc_infer/src/infer/mod.rs                         | 2 +-
 compiler/rustc_infer/src/infer/relate/mod.rs                  | 4 ++--
 .../src/infer/{nll_relate/mod.rs => relate/nll.rs}            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename compiler/rustc_infer/src/infer/{nll_relate/mod.rs => relate/nll.rs} (99%)

diff --git a/compiler/rustc_infer/src/infer/mod.rs b/compiler/rustc_infer/src/infer/mod.rs
index 88e4787848c..3de269da22d 100644
--- a/compiler/rustc_infer/src/infer/mod.rs
+++ b/compiler/rustc_infer/src/infer/mod.rs
@@ -51,6 +51,7 @@ use self::region_constraints::{
     RegionConstraintCollector, RegionConstraintStorage, RegionSnapshot,
 };
 pub use self::relate::combine::CombineFields;
+pub use self::relate::nll as nll_relate;
 use self::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 
 pub mod at;
@@ -60,7 +61,6 @@ pub mod free_regions;
 mod freshen;
 mod fudge;
 mod lexical_region_resolve;
-pub mod nll_relate;
 pub mod opaque_types;
 pub mod outlives;
 mod projection;
diff --git a/compiler/rustc_infer/src/infer/relate/mod.rs b/compiler/rustc_infer/src/infer/relate/mod.rs
index 37cbc2de27e..f688c2b74a6 100644
--- a/compiler/rustc_infer/src/infer/relate/mod.rs
+++ b/compiler/rustc_infer/src/infer/relate/mod.rs
@@ -1,6 +1,5 @@
 //! This module contains the definitions of most `TypeRelation`s in the type system
-//! (except for the NLL `TypeRelating`, and some relations used for diagnostics
-//! and heuristics in the compiler).
+//! (except for some relations used for diagnostics and heuristics in the compiler).
 
 pub(super) mod combine;
 mod equate;
@@ -9,4 +8,5 @@ mod glb;
 mod higher_ranked;
 mod lattice;
 mod lub;
+pub mod nll;
 mod sub;
diff --git a/compiler/rustc_infer/src/infer/nll_relate/mod.rs b/compiler/rustc_infer/src/infer/relate/nll.rs
similarity index 99%
rename from compiler/rustc_infer/src/infer/nll_relate/mod.rs
rename to compiler/rustc_infer/src/infer/relate/nll.rs
index a4af9c8f6b2..afc2a8b2f62 100644
--- a/compiler/rustc_infer/src/infer/nll_relate/mod.rs
+++ b/compiler/rustc_infer/src/infer/relate/nll.rs
@@ -30,8 +30,8 @@ use rustc_middle::ty::{self, InferConst, Ty, TyCtxt};
 use rustc_span::{Span, Symbol};
 use std::fmt::Debug;
 
-use super::relate::combine::ObligationEmittingRelation;
-use super::relate::generalize::{self, Generalization};
+use super::combine::ObligationEmittingRelation;
+use super::generalize::{self, Generalization};
 use crate::infer::InferCtxt;
 use crate::infer::{TypeVariableOrigin, TypeVariableOriginKind};
 use crate::traits::{Obligation, PredicateObligations};