Skip to content

Commit f50c76f

Browse files
authored
Rollup merge of #147209 - jieyouxu:remove-no-remap-src-base, r=Zalathar
Remove `no-remap-src-base` from tests Previously in the `//`-compiletest-directive times, `no-remap-src-base` was implemented as a special `no-*` directive parsing. In the migration from `//` -> `//`@`,` the `// no-remap-src-base` directive was lost, most likely because it had no effect -- the default is not remapping `src-base`. So remove occurrences of `no-remap-src-base`, as these are not valid directives. r? `@Zalathar` (since we discussed this on discord, or compiler)
2 parents 7b0236f + ec893d1 commit f50c76f

8 files changed

+5
-8
lines changed

tests/ui-fulldeps/mod_dir_path_canonicalized.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Testing that a librustc_ast can parse modules with canonicalized base path
33
//@ ignore-cross-compile
44
//@ ignore-remote
5-
// no-remap-src-base: Reading `file!()` (expectedly) fails when enabled.
65

76
#![feature(rustc_private)]
87

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//@ compile-flags: --remap-path-prefix={{src-base}}/errors/auxiliary=remapped-aux
2-
// no-remap-src-base: Manually remap, so the remapped path remains in .stderr file.
2+
// Manually remap, so the remapped path remains in .stderr file.
33

44
pub struct SomeStruct {} // This line should be show as part of the error.

tests/ui/errors/remap-path-prefix-reverse.local-self.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0423]: expected value, found struct `remapped_dep::SomeStruct`
2-
--> $DIR/remap-path-prefix-reverse.rs:16:13
2+
--> $DIR/remap-path-prefix-reverse.rs:15:13
33
|
44
LL | let _ = remapped_dep::SomeStruct;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `remapped_dep::SomeStruct {}`

tests/ui/errors/remap-path-prefix-reverse.remapped-self.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0423]: expected value, found struct `remapped_dep::SomeStruct`
2-
--> $DIR/remap-path-prefix-reverse.rs:16:13
2+
--> $DIR/remap-path-prefix-reverse.rs:15:13
33
|
44
LL | let _ = remapped_dep::SomeStruct;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `remapped_dep::SomeStruct {}`

tests/ui/errors/remap-path-prefix-reverse.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//@ compile-flags: --remap-path-prefix={{src-base}}/errors/auxiliary=remapped-aux
33

44
//@ revisions: local-self remapped-self
5-
// [local-self] no-remap-src-base: The hack should work regardless of remapping.
65
//@ [remapped-self] remap-src-base
76

87
// Verify that the expected source code is shown.

tests/ui/errors/remap-path-prefix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@ compile-flags: --remap-path-prefix={{src-base}}=remapped
33
//@ [with-diagnostic-scope]compile-flags: -Zremap-path-scope=diagnostics
44
//@ [without-diagnostic-scope]compile-flags: -Zremap-path-scope=object
5-
// no-remap-src-base: Manually remap, so the remapped path remains in .stderr file.
5+
// Manually remap, so the remapped path remains in .stderr file.
66

77
// The remapped paths are not normalized by compiletest.
88
//@ normalize-stderr: "\\(errors)" -> "/$1"

tests/ui/proc-macro/expand-expr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ proc-macro: expand-expr.rs
22
//@ ignore-backends: gcc
3-
// no-remap-src-base: check_expand_expr_file!() fails when enabled.
3+
// No `remap-src-base`, since `check_expand_expr_file!()` fails when enabled.
44

55
#![feature(concat_bytes)]
66
extern crate expand_expr;

tests/ui/proc-macro/pretty-print-hack-show.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ proc-macro: test-macros.rs
22
//@ compile-flags: -Z span-debug
33
//@ revisions: local remapped
4-
// [local] no-remap-src-base: The hack should work regardless of remapping.
54
//@ [remapped] remap-src-base
65

76
#![no_std] // Don't load unnecessary hygiene information from std

0 commit comments

Comments
 (0)