From 7c8f29f02c279acfa7b0c353e2187ad268e25de8 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Thu, 18 May 2023 14:36:13 +0000 Subject: Revert spurious changes. --- .../src/graph/dominators/tests.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'compiler/rustc_data_structures/src') diff --git a/compiler/rustc_data_structures/src/graph/dominators/tests.rs b/compiler/rustc_data_structures/src/graph/dominators/tests.rs index 31531fe3e2a..8b124516623 100644 --- a/compiler/rustc_data_structures/src/graph/dominators/tests.rs +++ b/compiler/rustc_data_structures/src/graph/dominators/tests.rs @@ -6,8 +6,8 @@ use super::super::tests::TestGraph; fn diamond() { let graph = TestGraph::new(0, &[(0, 1), (0, 2), (1, 3), (2, 3)]); - let tree = dominators(&graph); - let immediate_dominators = &tree.immediate_dominators; + let dominators = dominators(&graph); + let immediate_dominators = &dominators.immediate_dominators; assert_eq!(immediate_dominators[0], None); assert_eq!(immediate_dominators[1], Some(0)); assert_eq!(immediate_dominators[2], Some(0)); @@ -22,8 +22,8 @@ fn paper() { &[(6, 5), (6, 4), (5, 1), (4, 2), (4, 3), (1, 2), (2, 3), (3, 2), (2, 1)], ); - let dom_tree = dominators(&graph); - let immediate_dominators = &dom_tree.immediate_dominators; + let dominators = dominators(&graph); + let immediate_dominators = &dominators.immediate_dominators; assert_eq!(immediate_dominators[0], None); // <-- note that 0 is not in graph assert_eq!(immediate_dominators[1], Some(6)); assert_eq!(immediate_dominators[2], Some(6)); @@ -47,9 +47,9 @@ fn paper_slt() { #[test] fn immediate_dominator() { let graph = TestGraph::new(1, &[(1, 2), (2, 3)]); - let tree = dominators(&graph); - assert_eq!(tree.immediate_dominator(0), None); - assert_eq!(tree.immediate_dominator(1), None); - assert_eq!(tree.immediate_dominator(2), Some(1)); - assert_eq!(tree.immediate_dominator(3), Some(2)); + let dominators = dominators(&graph); + assert_eq!(dominators.immediate_dominator(0), None); + assert_eq!(dominators.immediate_dominator(1), None); + assert_eq!(dominators.immediate_dominator(2), Some(1)); + assert_eq!(dominators.immediate_dominator(3), Some(2)); } -- cgit 1.4.1-3-g733a5