Skip to content

Rollup of 4 pull requests #113820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Rollup of 4 pull requests #113820

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ce6183
Fix compiletest windows path finding with spaces
Alexendoo Jul 14, 2023
063ddbe
Add the `no-builtins` attribute to functions when `no_builtins` is ap…
dianqk Jul 15, 2023
603fd42
Properly document lifetime_mapping in OpaqueTy
compiler-errors Jul 17, 2023
33bd453
Fix removal span calculation of unused_qualifications suggestion
jieyouxu Jul 18, 2023
4b5f7e7
Rollup merge of #113706 - Alexendoo:compiletest-backslash-re, r=oli-obk
matthiaskrgr Jul 18, 2023
3b07653
Rollup merge of #113716 - DianQK:add-no_builtins-to-function, r=pnkfelix
matthiaskrgr Jul 18, 2023
b3893c5
Rollup merge of #113795 - compiler-errors:doc, r=spastorino
matthiaskrgr Jul 18, 2023
ca4fc54
Rollup merge of #113811 - jieyouxu:fix-unused-qualifications-suggesti…
matthiaskrgr Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix compiletest windows path finding with spaces
  • Loading branch information
@Alexendoo
Alexendoo committed Jul 14, 2023
commit 1ce61836dc82dcda36b7016e682ff43ff6eb1a13
4 changes: 2 additions & 2 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4149,8 +4149,8 @@ impl<'test> TestCx<'test> {
# Match paths that don't include spaces.
(?:\\[\pL\pN\.\-_']+)+\.\pL+
|
# If the path starts with a well-known root, then allow spaces.
\$(?:DIR|SRC_DIR|TEST_BUILD_DIR|BUILD_DIR|LIB_DIR)(?:\\[\pL\pN\.\-_' ]+)+
# If the path starts with a well-known root, then allow spaces and no file extension.
\$(?:DIR|SRC_DIR|TEST_BUILD_DIR|BUILD_DIR|LIB_DIR)(?:\\[\pL\pN\.\-_'\ ]+)+
)"#,
)
.unwrap()
Expand Down
8 changes: 4 additions & 4 deletions src/tools/compiletest/src/runtest/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ fn normalize_platform_differences() {
"$BUILD_DIR/../parser.rs"
);
assert_eq!(
TestCx::normalize_platform_differences(r"$DIR\bar.rs hello\nworld"),
r"$DIR/bar.rs hello\nworld"
TestCx::normalize_platform_differences(r"$DIR\bar.rs: hello\nworld"),
r"$DIR/bar.rs: hello\nworld"
);
assert_eq!(
TestCx::normalize_platform_differences(r"either bar\baz.rs or bar\baz\mod.rs"),
Expand All @@ -27,8 +27,8 @@ fn normalize_platform_differences() {
);
assert_eq!(TestCx::normalize_platform_differences(r"$DIR\foo.rs:12:11"), "$DIR/foo.rs:12:11",);
assert_eq!(
TestCx::normalize_platform_differences(r"$DIR\path with spaces 'n' quotes"),
"$DIR/path with spaces 'n' quotes",
TestCx::normalize_platform_differences(r"$DIR\path with\spaces 'n' quotes"),
"$DIR/path with/spaces 'n' quotes",
);
assert_eq!(
TestCx::normalize_platform_differences(r"$DIR\file_with\no_extension"),
Expand Down