itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove normalized_lines_match, it is not needed.

Browse Source
This commit is contained in:
Eric Huss 2021-06-15 18:04:50 -07:00
parent 6dff99781d
commit 24b8936c20
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/cargo-test-support/src/compare.rs
View File

@ -512,13 +512,6 @@ pub fn lines_match(expected: &str, mut actual: &str) -> bool {
actual.is_empty() || expected.ends_with("[..]") actual.is_empty() || expected.ends_with("[..]")
} }
/// Variant of `lines_match` that applies normalization to the strings.
pub fn normalized_lines_match(expected: &str, actual: &str, cwd: Option<&Path>) -> bool {
let expected = normalize_expected(expected, cwd);
let actual = normalize_actual(actual, cwd);
lines_match(&expected, &actual)
}
/// Compares JSON object for approximate equality. /// Compares JSON object for approximate equality.
/// You can use `[..]` wildcard in strings (useful for OS-dependent things such /// You can use `[..]` wildcard in strings (useful for OS-dependent things such
/// as paths). You can use a `"{...}"` string literal as a wildcard for /// as paths). You can use a `"{...}"` string literal as a wildcard for

21
tests/testsuite/config.rs
View File

@ -5,8 +5,8 @@ use cargo::util::config::{self, Config, SslVersionConfig, StringList};
use cargo::util::interning::InternedString; use cargo::util::interning::InternedString;
use cargo::util::toml::{self, VecStringOrBool as VSOB}; use cargo::util::toml::{self, VecStringOrBool as VSOB};
use cargo::CargoResult; use cargo::CargoResult;
use cargo_test_support::compare::normalized_lines_match; use cargo_test_support::compare;
use cargo_test_support::{paths, project, t}; use cargo_test_support::{panic_error, paths, project, t};
use serde::Deserialize; use serde::Deserialize;
use std::borrow::Borrow; use std::borrow::Borrow;
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
@ -210,11 +210,8 @@ pub fn assert_error<E: Borrow<anyhow::Error>>(error: E, msgs: &str) {
#[track_caller] #[track_caller]
pub fn assert_match(expected: &str, actual: &str) { pub fn assert_match(expected: &str, actual: &str) {
if !normalized_lines_match(expected, actual, None) { if let Err(e) = compare::match_exact(expected, actual, "output", "", None) {
panic!( panic_error("", e);
"Did not find expected:\n{}\nActual:\n{}\n",
expected, actual
);
} }
} }
@ -277,15 +274,7 @@ f1 = 1
// It should NOT have warned for the symlink. // It should NOT have warned for the symlink.
let output = read_output(config); let output = read_output(config);
let unexpected = "\ assert_eq!(output, "");
warning: Both `[..]/.cargo/config` and `[..]/.cargo/config.toml` exist. Using `[..]/.cargo/config`
";
if normalized_lines_match(unexpected, &output, None) {
panic!(
"Found unexpected:\n{}\nActual error:\n{}\n",
unexpected, output
);
}
} }
#[cargo_test] #[cargo_test]