Rollup merge of #58306 - GuillaumeGomez:crate-browser-history, r=QuietMisdreavus

[rust.git] / src / librustc_data_structures / graph / scc / test.rs

diff --git a/src/librustc_data_structures/graph/scc/test.rs b/src/librustc_data_structures/graph/scc/test.rs
index a273d64a40c410340fa3a37b86004dea123ae393..da3a1ceefe94bc6fbb144253ad7e29f750007f2c 100644 (file)
--- a/src/librustc_data_structures/graph/scc/test.rs
+++ b/src/librustc_data_structures/graph/scc/test.rs
@@ -1,16 +1,6 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![cfg(test)]
 
-use graph::test::TestGraph;
+use crate::graph::test::TestGraph;
 use super::*;
 
 #[test]
@@ -85,9 +75,30 @@ fn test_three_sccs() {
 #[test]
 fn test_find_state_2() {
     // The order in which things will be visited is important to this
-    // test. It tests part of the `find_state` behavior.
+    // test. It tests part of the `find_state` behavior. Here is the
+    // graph:
+    //
     //
-    // We will start in our DFS by visiting:
+    //       /----+
+    //     0 <--+ |
+    //     |    | |
+    //     v    | |
+    // +-> 1 -> 3 4
+    // |   |      |
+    // |   v      |
+    // +-- 2 <----+
+
+    let graph = TestGraph::new(0, &[
+        (0, 1),
+        (0, 4),
+        (1, 2),
+        (1, 3),
+        (2, 1),
+        (3, 0),
+        (4, 2),
+    ]);
+
+    // For this graph, we will start in our DFS by visiting:
     //
     // 0 -> 1 -> 2 -> 1
     //
@@ -114,25 +125,6 @@ fn test_find_state_2() {
     // 2 InCycleWith { 1 }
     // 3 InCycleWith { 0 }
 
-    /*
-      /----+
-    0 <--+ |
-    |    | |
-    v    | |
-+-> 1 -> 3 4
-|   |      |
-|   v      |
-+-- 2 <----+
-     */
-    let graph = TestGraph::new(0, &[
-        (0, 1),
-        (0, 4),
-        (1, 2),
-        (1, 3),
-        (2, 1),
-        (3, 0),
-        (4, 2),
-    ]);
     let sccs: Sccs<_, usize> = Sccs::new(&graph);
     assert_eq!(sccs.num_sccs(), 1);
     assert_eq!(sccs.scc(0), 0);