From 0fa8481ba390dc9b860123950717acbb34bd39fd Mon Sep 17 00:00:00 2001 From: mcarton Date: Wed, 23 Dec 2015 17:48:30 +0100 Subject: [PATCH] Put tests in tests folder --- src/matches.rs | 22 ++++------------------ tests/matches.rs | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 tests/matches.rs diff --git a/src/matches.rs b/src/matches.rs index 053b6b072b5..e4172b40932 100644 --- a/src/matches.rs +++ b/src/matches.rs @@ -254,9 +254,9 @@ fn all_ranges(cx: &LateContext, arms: &[Arm]) -> Vec> { } #[derive(Debug, Eq, PartialEq)] -struct SpannedRange { - span: Span, - node: (T, T), +pub struct SpannedRange { + pub span: Span, + pub node: (T, T), } #[derive(Debug)] @@ -339,7 +339,7 @@ fn match_template(cx: &LateContext, } } -fn overlapping(ranges: &[SpannedRange]) -> Option<(&SpannedRange, &SpannedRange)> +pub fn overlapping(ranges: &[SpannedRange]) -> Option<(&SpannedRange, &SpannedRange)> where T: Copy + Ord { #[derive(Copy, Clone, Debug, Eq, PartialEq)] enum Kind<'a, T: 'a> { @@ -392,17 +392,3 @@ fn overlapping(ranges: &[SpannedRange]) -> Option<(&SpannedRange, &Span None } - -#[test] -fn test_overlapping() { - use syntax::codemap::DUMMY_SP; - - let sp = |s, e| SpannedRange { span: DUMMY_SP, node: (s, e) }; - - assert_eq!(None, overlapping::(&[])); - assert_eq!(None, overlapping(&[sp(1, 4)])); - assert_eq!(None, overlapping(&[sp(1, 4), sp(5, 6)])); - assert_eq!(None, overlapping(&[sp(1, 4), sp(5, 6), sp(10, 11)])); - assert_eq!(Some((&sp(1, 4), &sp(3, 6))), overlapping(&[sp(1, 4), sp(3, 6)])); - assert_eq!(Some((&sp(5, 6), &sp(6, 11))), overlapping(&[sp(1, 4), sp(5, 6), sp(6, 11)])); -} diff --git a/tests/matches.rs b/tests/matches.rs new file mode 100644 index 00000000000..03cc5281741 --- /dev/null +++ b/tests/matches.rs @@ -0,0 +1,20 @@ +#![allow(plugin_as_library)] +#![feature(rustc_private)] + +extern crate clippy; +extern crate syntax; + +#[test] +fn test_overlapping() { + use clippy::matches::overlapping; + use syntax::codemap::DUMMY_SP; + + let sp = |s, e| clippy::matches::SpannedRange { span: DUMMY_SP, node: (s, e) }; + + assert_eq!(None, overlapping::(&[])); + assert_eq!(None, overlapping(&[sp(1, 4)])); + assert_eq!(None, overlapping(&[sp(1, 4), sp(5, 6)])); + assert_eq!(None, overlapping(&[sp(1, 4), sp(5, 6), sp(10, 11)])); + assert_eq!(Some((&sp(1, 4), &sp(3, 6))), overlapping(&[sp(1, 4), sp(3, 6)])); + assert_eq!(Some((&sp(5, 6), &sp(6, 11))), overlapping(&[sp(1, 4), sp(5, 6), sp(6, 11)])); +}