From 2d41bc3e6c1adb8abce5c796cfd24f77fee6f420 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 25 Aug 2018 14:26:34 +0300 Subject: rename --- crates/assert_eq_text/Cargo.toml | 8 -------- crates/assert_eq_text/src/lib.rs | 36 ------------------------------------ crates/libanalysis/Cargo.toml | 2 +- crates/libanalysis/tests/tests.rs | 4 ++-- crates/libeditor/Cargo.toml | 2 +- crates/libeditor/tests/test.rs | 4 ++-- crates/libsyntax2/Cargo.toml | 2 +- crates/libsyntax2/tests/test/main.rs | 2 +- crates/test_utils/Cargo.toml | 8 ++++++++ crates/test_utils/src/lib.rs | 36 ++++++++++++++++++++++++++++++++++++ 10 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 crates/assert_eq_text/Cargo.toml delete mode 100644 crates/assert_eq_text/src/lib.rs create mode 100644 crates/test_utils/Cargo.toml create mode 100644 crates/test_utils/src/lib.rs diff --git a/crates/assert_eq_text/Cargo.toml b/crates/assert_eq_text/Cargo.toml deleted file mode 100644 index e122bbbeb..000000000 --- a/crates/assert_eq_text/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "assert_eq_text" -version = "0.1.0" -authors = ["Aleksey Kladov "] - -[dependencies] -difference = "2.0.0" -itertools = "0.7.8" diff --git a/crates/assert_eq_text/src/lib.rs b/crates/assert_eq_text/src/lib.rs deleted file mode 100644 index 26b9bfb38..000000000 --- a/crates/assert_eq_text/src/lib.rs +++ /dev/null @@ -1,36 +0,0 @@ -extern crate difference; -extern crate itertools; - -use std::fmt; -use itertools::Itertools; - -pub use self::difference::Changeset as __Changeset; - -#[macro_export] -macro_rules! assert_eq_text { - ($expected:expr, $actual:expr) => {{ - let expected = $expected; - let actual = $actual; - if expected != actual { - let changeset = $crate::__Changeset::new(actual, expected, "\n"); - println!("Expected:\n{}\n\nActual:\n{}\nDiff:{}\n", expected, actual, changeset); - panic!("text differs"); - } - }}; - ($expected:expr, $actual:expr, $($tt:tt)*) => {{ - let expected = $expected; - let actual = $actual; - if expected != actual { - let changeset = $crate::__Changeset::new(actual, expected, "\n"); - println!("Expected:\n{}\n\nActual:\n{}\n\nDiff:\n{}\n", expected, actual, changeset); - println!($($tt)*); - panic!("text differs"); - } - }}; -} - -pub fn assert_eq_dbg(expected: &str, actual: &impl fmt::Debug) { - let actual = format!("{:?}", actual); - let expected = expected.lines().map(|l| l.trim()).join(" "); - assert_eq!(expected, actual); -} diff --git a/crates/libanalysis/Cargo.toml b/crates/libanalysis/Cargo.toml index fa859ff94..6337bcf64 100644 --- a/crates/libanalysis/Cargo.toml +++ b/crates/libanalysis/Cargo.toml @@ -14,4 +14,4 @@ libsyntax2 = { path = "../libsyntax2" } libeditor = { path = "../libeditor" } [dev-dependencies] -assert_eq_text = { path = "../assert_eq_text" } +test_utils = { path = "../test_utils" } diff --git a/crates/libanalysis/tests/tests.rs b/crates/libanalysis/tests/tests.rs index 931ab4183..32abf9152 100644 --- a/crates/libanalysis/tests/tests.rs +++ b/crates/libanalysis/tests/tests.rs @@ -1,10 +1,10 @@ extern crate libanalysis; -extern crate assert_eq_text; +extern crate test_utils; use std::path::PathBuf; use libanalysis::{WorldState, FileId}; -use assert_eq_text::assert_eq_dbg; +use test_utils::assert_eq_dbg; #[test] diff --git a/crates/libeditor/Cargo.toml b/crates/libeditor/Cargo.toml index 55f41c2c5..265772204 100644 --- a/crates/libeditor/Cargo.toml +++ b/crates/libeditor/Cargo.toml @@ -11,4 +11,4 @@ superslice = "0.1.0" libsyntax2 = { path = "../libsyntax2" } [dev-dependencies] -assert_eq_text = { path = "../assert_eq_text" } +test_utils = { path = "../test_utils" } diff --git a/crates/libeditor/tests/test.rs b/crates/libeditor/tests/test.rs index 7e5e75ec2..04c616ff4 100644 --- a/crates/libeditor/tests/test.rs +++ b/crates/libeditor/tests/test.rs @@ -1,9 +1,9 @@ extern crate libeditor; extern crate libsyntax2; #[macro_use] -extern crate assert_eq_text; +extern crate test_utils; -use assert_eq_text::{assert_eq_dbg}; +use test_utils::{assert_eq_dbg}; use libsyntax2::{File, TextUnit, TextRange}; use libeditor::{ ActionResult, diff --git a/crates/libsyntax2/Cargo.toml b/crates/libsyntax2/Cargo.toml index e8810046a..918c02775 100644 --- a/crates/libsyntax2/Cargo.toml +++ b/crates/libsyntax2/Cargo.toml @@ -13,5 +13,5 @@ parking_lot = "0.6.0" smol_str = "0.1.0" [dev-dependencies] -assert_eq_text = { path = "../assert_eq_text" } +test_utils = { path = "../test_utils" } walkdir = "2.2.0" diff --git a/crates/libsyntax2/tests/test/main.rs b/crates/libsyntax2/tests/test/main.rs index 18c711aee..cb8a52c98 100644 --- a/crates/libsyntax2/tests/test/main.rs +++ b/crates/libsyntax2/tests/test/main.rs @@ -1,6 +1,6 @@ extern crate libsyntax2; #[macro_use] -extern crate assert_eq_text; +extern crate test_utils; extern crate walkdir; use std::{ diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml new file mode 100644 index 000000000..3d336a9b4 --- /dev/null +++ b/crates/test_utils/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "test_utils" +version = "0.1.0" +authors = ["Aleksey Kladov "] + +[dependencies] +difference = "2.0.0" +itertools = "0.7.8" diff --git a/crates/test_utils/src/lib.rs b/crates/test_utils/src/lib.rs new file mode 100644 index 000000000..26b9bfb38 --- /dev/null +++ b/crates/test_utils/src/lib.rs @@ -0,0 +1,36 @@ +extern crate difference; +extern crate itertools; + +use std::fmt; +use itertools::Itertools; + +pub use self::difference::Changeset as __Changeset; + +#[macro_export] +macro_rules! assert_eq_text { + ($expected:expr, $actual:expr) => {{ + let expected = $expected; + let actual = $actual; + if expected != actual { + let changeset = $crate::__Changeset::new(actual, expected, "\n"); + println!("Expected:\n{}\n\nActual:\n{}\nDiff:{}\n", expected, actual, changeset); + panic!("text differs"); + } + }}; + ($expected:expr, $actual:expr, $($tt:tt)*) => {{ + let expected = $expected; + let actual = $actual; + if expected != actual { + let changeset = $crate::__Changeset::new(actual, expected, "\n"); + println!("Expected:\n{}\n\nActual:\n{}\n\nDiff:\n{}\n", expected, actual, changeset); + println!($($tt)*); + panic!("text differs"); + } + }}; +} + +pub fn assert_eq_dbg(expected: &str, actual: &impl fmt::Debug) { + let actual = format!("{:?}", actual); + let expected = expected.lines().map(|l| l.trim()).join(" "); + assert_eq!(expected, actual); +} -- cgit v1.2.3