about summary refs log tree commit diff
path: root/compiler/rustc_mir_dataflow/src/framework
diff options
context:
space:
mode:
authorNicholas Nethercote <n.nethercote@gmail.com>2023-11-24 11:18:12 +1100
committerNicholas Nethercote <n.nethercote@gmail.com>2023-11-27 10:35:43 +1100
commit34aa36b266f4e94c73392353e5651797997f5845 (patch)
tree5561be2b08a98b2d635bc17771b7ff7bae1af876 /compiler/rustc_mir_dataflow/src/framework
parent500e55ba8c07d0e2a4dce4e51ad79dac21c94d6f (diff)
downloadrust-34aa36b266f4e94c73392353e5651797997f5845.tar.gz
rust-34aa36b266f4e94c73392353e5651797997f5845.zip
Remove `ResultsCloned` and `ResultsClonedCursor`.
They're now unused.
Diffstat (limited to 'compiler/rustc_mir_dataflow/src/framework')
-rw-r--r--compiler/rustc_mir_dataflow/src/framework/cursor.rs7
-rw-r--r--compiler/rustc_mir_dataflow/src/framework/engine.rs19
-rw-r--r--compiler/rustc_mir_dataflow/src/framework/mod.rs4
3 files changed, 4 insertions, 26 deletions
diff --git a/compiler/rustc_mir_dataflow/src/framework/cursor.rs b/compiler/rustc_mir_dataflow/src/framework/cursor.rs
index 6033f331966..8cc22717f70 100644
--- a/compiler/rustc_mir_dataflow/src/framework/cursor.rs
+++ b/compiler/rustc_mir_dataflow/src/framework/cursor.rs
@@ -9,7 +9,7 @@ use std::cmp::Ordering;
 use rustc_index::bit_set::BitSet;
 use rustc_middle::mir::{self, BasicBlock, Location};
 
-use super::{Analysis, Direction, Effect, EffectIndex, EntrySets, Results, ResultsCloned};
+use super::{Analysis, Direction, Effect, EffectIndex, EntrySets, Results};
 
 // `AnalysisResults` is needed as an impl such as the following has an unconstrained type
 // parameter:
@@ -40,11 +40,6 @@ where
     type EntrySets = E;
 }
 
-/// A `ResultsCursor` which uses a cloned `Analysis` while borrowing the underlying `Results`. This
-/// allows multiple cursors over the same `Results`.
-pub type ResultsClonedCursor<'res, 'mir, 'tcx, A> =
-    ResultsCursor<'mir, 'tcx, A, ResultsCloned<'res, 'tcx, A>>;
-
 /// Allows random access inspection of the results of a dataflow analysis.
 ///
 /// This cursor only has linear performance within a basic block when its statements are visited in
diff --git a/compiler/rustc_mir_dataflow/src/framework/engine.rs b/compiler/rustc_mir_dataflow/src/framework/engine.rs
index 6be0cb06fc5..96a61c0d855 100644
--- a/compiler/rustc_mir_dataflow/src/framework/engine.rs
+++ b/compiler/rustc_mir_dataflow/src/framework/engine.rs
@@ -25,7 +25,7 @@ use super::fmt::DebugWithContext;
 use super::graphviz;
 use super::{
     visit_results, Analysis, AnalysisDomain, Direction, GenKill, GenKillAnalysis, GenKillSet,
-    JoinSemiLattice, ResultsClonedCursor, ResultsCursor, ResultsVisitor,
+    JoinSemiLattice, ResultsCursor, ResultsVisitor,
 };
 
 pub type EntrySets<'tcx, A> = IndexVec<BasicBlock, <A as AnalysisDomain<'tcx>>::Domain>;
@@ -41,9 +41,6 @@ where
     pub(super) _marker: PhantomData<&'tcx ()>,
 }
 
-/// `Results` type with a cloned `Analysis` and borrowed entry sets.
-pub type ResultsCloned<'res, 'tcx, A> = Results<'tcx, A, &'res EntrySets<'tcx, A>>;
-
 impl<'tcx, A, E> Results<'tcx, A, E>
 where
     A: Analysis<'tcx>,
@@ -81,20 +78,6 @@ where
     }
 }
 
-impl<'tcx, A> Results<'tcx, A>
-where
-    A: Analysis<'tcx> + Copy,
-{
-    /// Creates a `ResultsCursor` that can inspect these `Results`.
-    pub fn cloned_results_cursor<'mir>(
-        &self,
-        body: &'mir mir::Body<'tcx>,
-    ) -> ResultsClonedCursor<'_, 'mir, 'tcx, A> {
-        Results { analysis: self.analysis, entry_sets: &self.entry_sets, _marker: PhantomData }
-            .into_results_cursor(body)
-    }
-}
-
 /// A solver for dataflow problems.
 pub struct Engine<'mir, 'tcx, A>
 where
diff --git a/compiler/rustc_mir_dataflow/src/framework/mod.rs b/compiler/rustc_mir_dataflow/src/framework/mod.rs
index d732ea5d4ea..71dff5181cc 100644
--- a/compiler/rustc_mir_dataflow/src/framework/mod.rs
+++ b/compiler/rustc_mir_dataflow/src/framework/mod.rs
@@ -45,9 +45,9 @@ pub mod graphviz;
 pub mod lattice;
 mod visitor;
 
-pub use self::cursor::{ResultsClonedCursor, ResultsCursor};
+pub use self::cursor::ResultsCursor;
 pub use self::direction::{Backward, Direction, Forward};
-pub use self::engine::{Engine, EntrySets, Results, ResultsCloned};
+pub use self::engine::{Engine, EntrySets, Results};
 pub use self::lattice::{JoinSemiLattice, MaybeReachable};
 pub use self::visitor::{visit_results, ResultsVisitable, ResultsVisitor};