Auto merge of rust-lang#2413 - RalfJung:norm, r=RalfJung

bors · bors · commit dac1676eb3be · 2022-07-21T19:37:34.000Z
normalize stronger

rustc CI has the cargo stuff in `/cargo/...`, so we also need to handle that path.
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
@@ -133,7 +133,7 @@ regexes! {
     // erase platform file paths
     "sys/[a-z]+/"                    => "sys/PLATFORM/",
     // erase paths into the crate registry
-    r"[^ ]*/\.cargo/registry/.*/(.*\.rs)"  => "CARGO_REGISTRY/$1",
+    r"[^ ]*/\.?cargo/registry/.*/(.*\.rs)"  => "CARGO_REGISTRY/.../$1",
 }
 
 fn ui(mode: Mode, path: &str) -> Result<()> {
diff --git a/tests/fail/crates/tokio_mvp.stderr b/tests/fail/crates/tokio_mvp.stderr
@@ -1,5 +1,5 @@
 error: unsupported operation: can't call foreign function: epoll_create1
-  --> CARGO_REGISTRY/epoll.rs:LL:CC
+  --> CARGO_REGISTRY/.../epoll.rs:LL:CC
    |
 LL |         syscall!(epoll_create1(flag)).map(|ep| Selector {
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't call foreign function: epoll_create1

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ regexes! {`
`133`	`133`	`// erase platform file paths`
`134`	`134`	`"sys/[a-z]+/" => "sys/PLATFORM/",`
`135`	`135`	`// erase paths into the crate registry`
`136`		`- r"[^ ]/\.cargo/registry/./(.*\.rs)" => "CARGO_REGISTRY/$1",`
	`136`	`+ r"[^ ]/\.?cargo/registry/./(.*\.rs)" => "CARGO_REGISTRY/.../$1",`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`fn ui(mode: Mode, path: &str) -> Result<()> {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error: unsupported operation: can't call foreign function: epoll_create1`
`2`		`- --> CARGO_REGISTRY/epoll.rs:LL:CC`
	`2`	`+ --> CARGO_REGISTRY/.../epoll.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| syscall!(epoll_create1(flag)).map(\|ep\| Selector {`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't call foreign function: epoll_create1`