Merging upstream version 1.69.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 55 deletions

diff --git a/compiler/rustc_middle/src/middle/resolve_lifetime.rs b/compiler/rustc_middle/src/middle/resolve_lifetime.rs
deleted file mode 100644
index c3bf1c717..000000000
--- a/compiler/rustc_middle/src/middle/resolve_lifetime.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-//! Name resolution for lifetimes: type declarations.
-
-use crate::ty;
-
-use rustc_data_structures::fx::FxHashMap;
-use rustc_hir::def_id::DefId;
-use rustc_hir::{ItemLocalId, OwnerId};
-use rustc_macros::HashStable;
-
-#[derive(Clone, Copy, PartialEq, Eq, Hash, TyEncodable, TyDecodable, Debug, HashStable)]
-pub enum Region {
-    Static,
-    EarlyBound(/* lifetime decl */ DefId),
-    LateBound(ty::DebruijnIndex, /* late-bound index */ u32, /* lifetime decl */ DefId),
-    Free(DefId, /* lifetime decl */ DefId),
-}
-
-/// A set containing, at most, one known element.
-/// If two distinct values are inserted into a set, then it
-/// becomes `Many`, which can be used to detect ambiguities.
-#[derive(Copy, Clone, PartialEq, Eq, TyEncodable, TyDecodable, Debug, HashStable)]
-pub enum Set1<T> {
-    Empty,
-    One(T),
-    Many,
-}
-
-impl<T: PartialEq> Set1<T> {
-    pub fn insert(&mut self, value: T) {
-        *self = match self {
-            Set1::Empty => Set1::One(value),
-            Set1::One(old) if *old == value => return,
-            _ => Set1::Many,
-        };
-    }
-}
-
-#[derive(Copy, Clone, Debug, HashStable, Encodable, Decodable)]
-pub enum ObjectLifetimeDefault {
-    Empty,
-    Static,
-    Ambiguous,
-    Param(DefId),
-}
-
-/// Maps the id of each lifetime reference to the lifetime decl
-/// that it corresponds to.
-#[derive(Default, HashStable, Debug)]
-pub struct ResolveLifetimes {
-    /// Maps from every use of a named (not anonymous) lifetime to a
-    /// `Region` describing how that region is bound
-    pub defs: FxHashMap<OwnerId, FxHashMap<ItemLocalId, Region>>,
-
-    pub late_bound_vars: FxHashMap<OwnerId, FxHashMap<ItemLocalId, Vec<ty::BoundVariableKind>>>,
-}