diff options
Diffstat (limited to 'src/test/ui/include-macros')
| -rw-r--r-- | src/test/ui/include-macros/auxiliary/same-file-in-two-crates-aux.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/include-macros/data.bin | 2 | ||||
| -rw-r--r-- | src/test/ui/include-macros/file.txt | 0 | ||||
| -rw-r--r-- | src/test/ui/include-macros/mismatched-types.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/include-macros/mismatched-types.stderr | 27 | ||||
| -rw-r--r-- | src/test/ui/include-macros/normalization.rs | 12 | ||||
| -rw-r--r-- | src/test/ui/include-macros/same-file-in-two-crates.rs | 21 |
7 files changed, 0 insertions, 70 deletions
diff --git a/src/test/ui/include-macros/auxiliary/same-file-in-two-crates-aux.rs b/src/test/ui/include-macros/auxiliary/same-file-in-two-crates-aux.rs deleted file mode 100644 index 7b680bce4..000000000 --- a/src/test/ui/include-macros/auxiliary/same-file-in-two-crates-aux.rs +++ /dev/null @@ -1,4 +0,0 @@ -#[inline] -pub fn some_function() -> u32 { - 1 -} diff --git a/src/test/ui/include-macros/data.bin b/src/test/ui/include-macros/data.bin deleted file mode 100644 index ce4e0b831..000000000 --- a/src/test/ui/include-macros/data.bin +++ /dev/null @@ -1,2 +0,0 @@ -This file starts with BOM.
-Lines are separated by \r\n.
diff --git a/src/test/ui/include-macros/file.txt b/src/test/ui/include-macros/file.txt deleted file mode 100644 index e69de29bb..000000000 --- a/src/test/ui/include-macros/file.txt +++ /dev/null diff --git a/src/test/ui/include-macros/mismatched-types.rs b/src/test/ui/include-macros/mismatched-types.rs deleted file mode 100644 index 83fa378a3..000000000 --- a/src/test/ui/include-macros/mismatched-types.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - let b: &[u8] = include_str!("file.txt"); //~ ERROR mismatched types - let s: &str = include_bytes!("file.txt"); //~ ERROR mismatched types -} diff --git a/src/test/ui/include-macros/mismatched-types.stderr b/src/test/ui/include-macros/mismatched-types.stderr deleted file mode 100644 index a408877af..000000000 --- a/src/test/ui/include-macros/mismatched-types.stderr +++ /dev/null @@ -1,27 +0,0 @@ -error[E0308]: mismatched types - --> $DIR/mismatched-types.rs:2:20 - | -LL | let b: &[u8] = include_str!("file.txt"); - | ----- ^^^^^^^^^^^^^^^^^^^^^^^^ expected slice `[u8]`, found `str` - | | - | expected due to this - | - = note: expected reference `&[u8]` - found reference `&'static str` - = note: this error originates in the macro `include_str` (in Nightly builds, run with -Z macro-backtrace for more info) - -error[E0308]: mismatched types - --> $DIR/mismatched-types.rs:3:19 - | -LL | let s: &str = include_bytes!("file.txt"); - | ---- ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `str`, found array `[u8; 0]` - | | - | expected due to this - | - = note: expected reference `&str` - found reference `&'static [u8; 0]` - = note: this error originates in the macro `include_bytes` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0308`. diff --git a/src/test/ui/include-macros/normalization.rs b/src/test/ui/include-macros/normalization.rs deleted file mode 100644 index 889f08e60..000000000 --- a/src/test/ui/include-macros/normalization.rs +++ /dev/null @@ -1,12 +0,0 @@ -// run-pass - -fn main() { - assert_eq!( - &include_bytes!("data.bin")[..], - &b"\xEF\xBB\xBFThis file starts with BOM.\r\nLines are separated by \\r\\n.\r\n"[..], - ); - assert_eq!( - include_str!("data.bin"), - "\u{FEFF}This file starts with BOM.\r\nLines are separated by \\r\\n.\r\n", - ); -} diff --git a/src/test/ui/include-macros/same-file-in-two-crates.rs b/src/test/ui/include-macros/same-file-in-two-crates.rs deleted file mode 100644 index f49efa2cf..000000000 --- a/src/test/ui/include-macros/same-file-in-two-crates.rs +++ /dev/null @@ -1,21 +0,0 @@ -// This test makes sure that the compiler can handle the same source file to be -// part of the local crate *and* an upstream crate. This can happen, for example, -// when there is some auto-generated code that is part of both a library and an -// accompanying integration test. -// -// The test uses include!() to include a source file that is also part of -// an upstream crate. -// -// This is a regression test for https://github.com/rust-lang/rust/issues/85955. - -// check-pass -// compile-flags: --crate-type=rlib -// aux-build:same-file-in-two-crates-aux.rs -extern crate same_file_in_two_crates_aux; - -pub fn foo() -> u32 { - same_file_in_two_crates_aux::some_function() + - some_function() -} - -include!("./auxiliary/same-file-in-two-crates-aux.rs"); |