about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-07-09 08:41:43 +0000
committerbors <bors@rust-lang.org>2018-07-09 08:41:43 +0000
commitc30acc7187fe5ab9ca8a34411bb89bfe241a0662 (patch)
tree05125b050a11b95b68d2da6a5563345ea984bcb0 /src
parentec039c7cb14e75866f7943845fc370205f4e4fd4 (diff)
parent1be1d90662eab9823b815bb00e61788b0206e5d9 (diff)
downloadrust-c30acc7187fe5ab9ca8a34411bb89bfe241a0662.tar.gz
rust-c30acc7187fe5ab9ca8a34411bb89bfe241a0662.zip
Auto merge of #52160 - euclio:include-macros, r=oli-obk
add regression test for #48835

Fixes #48835.

The underlying issue was fixed in #51978.
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/include-macros/file.txt0
-rw-r--r--src/test/ui/include-macros/mismatched-types.rs14
-rw-r--r--src/test/ui/include-macros/mismatched-types.stderr21
3 files changed, 35 insertions, 0 deletions
diff --git a/src/test/ui/include-macros/file.txt b/src/test/ui/include-macros/file.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/src/test/ui/include-macros/file.txt
diff --git a/src/test/ui/include-macros/mismatched-types.rs b/src/test/ui/include-macros/mismatched-types.rs
new file mode 100644
index 00000000000..aca1b071644
--- /dev/null
+++ b/src/test/ui/include-macros/mismatched-types.rs
@@ -0,0 +1,14 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+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
new file mode 100644
index 00000000000..05286f2ca57
--- /dev/null
+++ b/src/test/ui/include-macros/mismatched-types.stderr
@@ -0,0 +1,21 @@
+error[E0308]: mismatched types
+  --> $DIR/mismatched-types.rs:12:20
+   |
+LL |     let b: &[u8] = include_str!("file.txt");    //~ ERROR mismatched types
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found str
+   |
+   = note: expected type `&[u8]`
+              found type `&'static str`
+
+error[E0308]: mismatched types
+  --> $DIR/mismatched-types.rs:13:19
+   |
+LL |     let s: &str = include_bytes!("file.txt");   //~ ERROR mismatched types
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected str, found array of 0 elements
+   |
+   = note: expected type `&str`
+              found type `&'static [u8; 0]`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.