Skip to content

Commit ccffea5

Browse files
committed
Move lexer unit tests to rustc_lexer
StringReader is an intornal abstraction which at the moment changes a lot, so these unit tests cause quite a bit of friction. Moving them to rustc_lexer and more ingerated-testing style should make them much less annoying, hopefully without decreasing their usefulness much. Note that coloncolon tests are removed (it's unclear what those are testing). \r\n tests are removed as well, as we normalize line endings even before lexing.
1 parent 85fbf49 commit ccffea5

File tree

4 files changed

+154
-278
lines changed

4 files changed

+154
-278
lines changed

Cargo.lock

+14-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ dependencies = [
342342
name = "cargo-miri"
343343
version = "0.1.0"
344344
dependencies = [
345-
"cargo_metadata 0.11.1",
345+
"cargo_metadata 0.9.1",
346346
"directories",
347347
"rustc-workspace-hack",
348348
"rustc_version",
@@ -391,6 +391,18 @@ dependencies = [
391391
"serde_json",
392392
]
393393

394+
[[package]]
395+
name = "cargo_metadata"
396+
version = "0.9.1"
397+
source = "registry+https://github.com/rust-lang/crates.io-index"
398+
checksum = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202"
399+
dependencies = [
400+
"semver 0.9.0",
401+
"serde",
402+
"serde_derive",
403+
"serde_json",
404+
]
405+
394406
[[package]]
395407
name = "cargo_metadata"
396408
version = "0.11.1"
@@ -1979,6 +1991,7 @@ dependencies = [
19791991
name = "miri"
19801992
version = "0.1.0"
19811993
dependencies = [
1994+
"byteorder",
19821995
"colored",
19831996
"compiletest_rs",
19841997
"env_logger 0.7.1",

compiler/rustc_expand/src/lib.rs

-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ mod tests;
3939
mod parse {
4040
#[cfg(test)]
4141
mod tests;
42-
#[cfg(test)]
43-
mod lexer {
44-
#[cfg(test)]
45-
mod tests;
46-
}
4742
}
4843
#[cfg(test)]
4944
mod tokenstream {

compiler/rustc_expand/src/parse/lexer/tests.rs

-252
This file was deleted.

0 commit comments

Comments
 (0)