mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed 'no such file or directory' mismatch between Windows and Linux.

Browse Source
This commit is contained in:
David Wood 2018-08-10 12:27:46 +02:00
parent 0cfc17358a
commit cd12c82210
No known key found for this signature in database
GPG Key ID: 01760B4F9F53F154
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/ui/extern/external-doc-error.rs vendored
View File

@ -8,6 +8,9 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// normalize-stderr-test: "The system cannot find the file specified\." -> "No such file or directory"
// ignore-tidy-linelength
#![feature(external_doc)] #![feature(external_doc)]
#[doc(include = "not-a-file.md")] //~ ERROR: couldn't read #[doc(include = "not-a-file.md")] //~ ERROR: couldn't read

2
src/test/ui/extern/external-doc-error.stderr vendored
View File

@ -1,5 +1,5 @@
error: couldn't read $DIR/not-a-file.md: No such file or directory (os error 2) error: couldn't read $DIR/not-a-file.md: No such file or directory (os error 2)
--> $DIR/external-doc-error.rs:13:1 --> $DIR/external-doc-error.rs:16:1
| |
LL | #[doc(include = "not-a-file.md")] //~ ERROR: couldn't read LL | #[doc(include = "not-a-file.md")] //~ ERROR: couldn't read
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

3
src/test/ui/macros/macros-nonfatal-errors.rs
View File

@ -8,6 +8,9 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// normalize-stderr-test: "The system cannot find the file specified\." -> "No such file or directory"
// ignore-tidy-linelength
// test that errors in a (selection) of macros don't kill compilation // test that errors in a (selection) of macros don't kill compilation
// immediately, so that we get more errors listed at a time. // immediately, so that we get more errors listed at a time.

30
src/test/ui/macros/macros-nonfatal-errors.stderr
View File

@ -1,47 +1,47 @@
error[E0665]: `Default` cannot be derived for enums, only structs error[E0665]: `Default` cannot be derived for enums, only structs
--> $DIR/macros-nonfatal-errors.rs:17:10 --> $DIR/macros-nonfatal-errors.rs:20:10
| |
LL | #[derive(Default)] //~ ERROR LL | #[derive(Default)] //~ ERROR
| ^^^^^^^ | ^^^^^^^
error: inline assembly must be a string literal error: inline assembly must be a string literal
--> $DIR/macros-nonfatal-errors.rs:21:10 --> $DIR/macros-nonfatal-errors.rs:24:10
| |
LL | asm!(invalid); //~ ERROR LL | asm!(invalid); //~ ERROR
| ^^^^^^^ | ^^^^^^^
error: concat_idents! requires ident args. error: concat_idents! requires ident args.
--> $DIR/macros-nonfatal-errors.rs:23:5 --> $DIR/macros-nonfatal-errors.rs:26:5
| |
LL | concat_idents!("not", "idents"); //~ ERROR LL | concat_idents!("not", "idents"); //~ ERROR
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: argument must be a string literal error: argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:25:17 --> $DIR/macros-nonfatal-errors.rs:28:17
| |
LL | option_env!(invalid); //~ ERROR LL | option_env!(invalid); //~ ERROR
| ^^^^^^^ | ^^^^^^^
error: expected string literal error: expected string literal
--> $DIR/macros-nonfatal-errors.rs:26:10 --> $DIR/macros-nonfatal-errors.rs:29:10
| |
LL | env!(invalid); //~ ERROR LL | env!(invalid); //~ ERROR
| ^^^^^^^ | ^^^^^^^
error: expected string literal error: expected string literal
--> $DIR/macros-nonfatal-errors.rs:27:10 --> $DIR/macros-nonfatal-errors.rs:30:10
| |
LL | env!(foo, abr, baz); //~ ERROR LL | env!(foo, abr, baz); //~ ERROR
| ^^^ | ^^^
error: environment variable `RUST_HOPEFULLY_THIS_DOESNT_EXIST` not defined error: environment variable `RUST_HOPEFULLY_THIS_DOESNT_EXIST` not defined
--> $DIR/macros-nonfatal-errors.rs:28:5 --> $DIR/macros-nonfatal-errors.rs:31:5
| |
LL | env!("RUST_HOPEFULLY_THIS_DOESNT_EXIST"); //~ ERROR LL | env!("RUST_HOPEFULLY_THIS_DOESNT_EXIST"); //~ ERROR
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0658]: non-ident macro paths are experimental (see issue #35896) error[E0658]: non-ident macro paths are experimental (see issue #35896)
--> $DIR/macros-nonfatal-errors.rs:30:5 --> $DIR/macros-nonfatal-errors.rs:33:5
| |
LL | foo::blah!(); //~ ERROR LL | foo::blah!(); //~ ERROR
| ^^^^^^^^^ | ^^^^^^^^^
@ -49,7 +49,7 @@ LL | foo::blah!(); //~ ERROR
= help: add #![feature(use_extern_macros)] to the crate attributes to enable = help: add #![feature(use_extern_macros)] to the crate attributes to enable
error: format argument must be a string literal error: format argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:32:13 --> $DIR/macros-nonfatal-errors.rs:35:13
| |
LL | format!(invalid); //~ ERROR LL | format!(invalid); //~ ERROR
| ^^^^^^^ | ^^^^^^^
@ -59,37 +59,37 @@ LL | format!("{}", invalid); //~ ERROR
| ^^^^^ | ^^^^^
error: argument must be a string literal error: argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:34:14 --> $DIR/macros-nonfatal-errors.rs:37:14
| |
LL | include!(invalid); //~ ERROR LL | include!(invalid); //~ ERROR
| ^^^^^^^ | ^^^^^^^
error: argument must be a string literal error: argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:36:18 --> $DIR/macros-nonfatal-errors.rs:39:18
| |
LL | include_str!(invalid); //~ ERROR LL | include_str!(invalid); //~ ERROR
| ^^^^^^^ | ^^^^^^^
error: couldn't read $DIR/i'd be quite surprised if a file with this name existed: No such file or directory (os error 2) error: couldn't read $DIR/i'd be quite surprised if a file with this name existed: No such file or directory (os error 2)
--> $DIR/macros-nonfatal-errors.rs:37:5 --> $DIR/macros-nonfatal-errors.rs:40:5
| |
LL | include_str!("i'd be quite surprised if a file with this name existed"); //~ ERROR LL | include_str!("i'd be quite surprised if a file with this name existed"); //~ ERROR
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: argument must be a string literal error: argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:38:20 --> $DIR/macros-nonfatal-errors.rs:41:20
| |
LL | include_bytes!(invalid); //~ ERROR LL | include_bytes!(invalid); //~ ERROR
| ^^^^^^^ | ^^^^^^^
error: couldn't read $DIR/i'd be quite surprised if a file with this name existed: No such file or directory (os error 2) error: couldn't read $DIR/i'd be quite surprised if a file with this name existed: No such file or directory (os error 2)
--> $DIR/macros-nonfatal-errors.rs:39:5 --> $DIR/macros-nonfatal-errors.rs:42:5
| |
LL | include_bytes!("i'd be quite surprised if a file with this name existed"); //~ ERROR LL | include_bytes!("i'd be quite surprised if a file with this name existed"); //~ ERROR
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: trace_macros! accepts only `true` or `false` error: trace_macros! accepts only `true` or `false`
--> $DIR/macros-nonfatal-errors.rs:41:5 --> $DIR/macros-nonfatal-errors.rs:44:5
| |
LL | trace_macros!(invalid); //~ ERROR LL | trace_macros!(invalid); //~ ERROR
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^