Skip to content

Commit

Permalink
Rollup merge of #76178 - matklad:et, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Update expect-test to 1.0

The only change is that `expect_file` now uses path relative to the
current file (same as `include!`). Before, it used paths relative to
the workspace root, which makes no sense.
  • Loading branch information
tmandry authored Sep 1, 2020
2 parents 9d435d2 + 5716c3e commit 8d328d7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -998,9 +998,9 @@ dependencies = [

[[package]]
name = "expect-test"
version = "0.1.0"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e383741ea1982866572109d1a8c807bd36aad91fca701489fdca56ef92b3b8"
checksum = "ceb96f3eaa0d4e8769c52dacfd4eb60183b817ed2f176171b3c691d5022b0f2e"
dependencies = [
"difference",
"once_cell",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_lexer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ doctest = false
unicode-xid = "0.2.0"

[dev-dependencies]
expect-test = "0.1"
expect-test = "1.0"
2 changes: 1 addition & 1 deletion src/librustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ tempfile = "3"
itertools = "0.8"

[dev-dependencies]
expect-test = "0.1"
expect-test = "1.0"
2 changes: 1 addition & 1 deletion src/librustdoc/html/highlight/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn test_html_highlighting() {
write_code(&mut out, src);
format!("{}<pre><code>{}</code></pre>\n", STYLE, out)
};
expect_file!["src/librustdoc/html/highlight/fixtures/sample.html"].assert_eq(&html);
expect_file!["fixtures/sample.html"].assert_eq(&html);
}

const STYLE: &str = r#"
Expand Down

0 comments on commit 8d328d7

Please sign in to comment.