Auto merge of #3901 - rail-rain:issue_1670, r=flip1995

[rust.git] / tests / matches.rs

diff --git a/tests/matches.rs b/tests/matches.rs
index fade73aad03d0252d7b209d84a8c1bfcff501e39..15a0ea503bf3f219c6c8e3aacf3566402aeb1f49 100644 (file)
--- a/tests/matches.rs
+++ b/tests/matches.rs
@@ -1,29 +1,42 @@
 #![feature(rustc_private)]
-#![feature(collections_bound)]
 
-extern crate clippy_lints;
 extern crate syntax;
 use std::collections::Bound;
 
 #[test]
 fn test_overlapping() {
     use clippy_lints::matches::overlapping;
-    use syntax::codemap::DUMMY_SP;
+    use syntax::source_map::DUMMY_SP;
 
-    let sp = |s, e| {
-        clippy_lints::matches::SpannedRange {
-            span: DUMMY_SP,
-            node: (s, e),
-        }
+    let sp = |s, e| clippy_lints::matches::SpannedRange {
+        span: DUMMY_SP,
+        node: (s, e),
     };
 
     assert_eq!(None, overlapping::<u8>(&[]));
     assert_eq!(None, overlapping(&[sp(1, Bound::Included(4))]));
-    assert_eq!(None, overlapping(&[sp(1, Bound::Included(4)), sp(5, Bound::Included(6))]));
-    assert_eq!(None,
-               overlapping(&[sp(1, Bound::Included(4)), sp(5, Bound::Included(6)), sp(10, Bound::Included(11))]));
-    assert_eq!(Some((&sp(1, Bound::Included(4)), &sp(3, Bound::Included(6)))),
-               overlapping(&[sp(1, Bound::Included(4)), sp(3, Bound::Included(6))]));
-    assert_eq!(Some((&sp(5, Bound::Included(6)), &sp(6, Bound::Included(11)))),
-               overlapping(&[sp(1, Bound::Included(4)), sp(5, Bound::Included(6)), sp(6, Bound::Included(11))]));
+    assert_eq!(
+        None,
+        overlapping(&[sp(1, Bound::Included(4)), sp(5, Bound::Included(6))])
+    );
+    assert_eq!(
+        None,
+        overlapping(&[
+            sp(1, Bound::Included(4)),
+            sp(5, Bound::Included(6)),
+            sp(10, Bound::Included(11))
+        ],)
+    );
+    assert_eq!(
+        Some((&sp(1, Bound::Included(4)), &sp(3, Bound::Included(6)))),
+        overlapping(&[sp(1, Bound::Included(4)), sp(3, Bound::Included(6))])
+    );
+    assert_eq!(
+        Some((&sp(5, Bound::Included(6)), &sp(6, Bound::Included(11)))),
+        overlapping(&[
+            sp(1, Bound::Included(4)),
+            sp(5, Bound::Included(6)),
+            sp(6, Bound::Included(11))
+        ],)
+    );
 }