-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #125205 - ChrisDenton:verbatim-include, r=jieyouxu
Fixup Windows verbatim paths when used with the `include!` macro On Windows, the following code can fail if the `OUT_DIR` environment variable is a [verbatim path](https://doc.rust-lang.org/std/path/enum.Prefix.html) (i.e. begins with `\\?\`): ```rust include!(concat!(env!("OUT_DIR"), "/src/repro.rs")); ``` This is because verbatim paths treat `/` literally, as if it were just another character in the file name. The good news is that the standard library already has code to fix this. We can simply use `components` to normalize the path so it works as intended.
- Loading branch information
Showing
4 changed files
with
28 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
static TEST: &str = "Hello World!"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
//@ only-windows other platforms do not have Windows verbatim paths | ||
use run_make_support::rustc; | ||
fn main() { | ||
// Canonicalizing the path ensures that it's verbatim (i.e. starts with `\\?\`) | ||
let mut path = std::fs::canonicalize(file!()).unwrap(); | ||
path.pop(); | ||
rustc().input("verbatim.rs").env("VERBATIM_DIR", path).run(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
//! Include a file by concating the verbatim path using `/` instead of `\` | ||
|
||
include!(concat!(env!("VERBATIM_DIR"), "/include/include.txt")); | ||
fn main() { | ||
assert_eq!(TEST, "Hello World!"); | ||
|
||
let s = include_str!(concat!(env!("VERBATIM_DIR"), "/include/include.txt")); | ||
assert_eq!(s, "static TEST: &str = \"Hello World!\";\n"); | ||
|
||
let b = include_bytes!(concat!(env!("VERBATIM_DIR"), "/include/include.txt")); | ||
assert_eq!(b, b"static TEST: &str = \"Hello World!\";\n"); | ||
} |