nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-30 05:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #122081 - onur-ozkan:validate-path-remaps, r=clubby789

Browse Source 
validate `builder::PATH_REMAP`

self-explanatory

r? clubby789
This commit is contained in:
Jubilee 2024-03-12 09:04:00 -07:00 committed by GitHub
commit 45cc461bfd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/src/core/builder.rs
View File

@ -291,7 +291,7 @@ impl PathSet {
const PATH_REMAP: &[(&str, &[&str])] = &[
// config.toml uses `rust-analyzer-proc-macro-srv`, but the
// actual path is `proc-macro-srv-cli`
("rust-analyzer-proc-macro-srv", &["proc-macro-srv-cli"]),
("rust-analyzer-proc-macro-srv", &["src/tools/rust-analyzer/crates/proc-macro-srv-cli"]),
// Make `x test tests` function the same as `x t tests/*`
(
"tests",

13
src/bootstrap/src/core/builder/tests.rs
View File

@ -115,6 +115,19 @@ fn test_intersection() {
assert_eq!(command_paths, vec![Path::new("library/stdarch")]);
}
#[test]
fn validate_path_remap() {
let build = Build::new(configure("test", &["A"], &["A"]));
PATH_REMAP
.iter()
.flat_map(|(_, paths)| paths.iter())
.map(|path| build.src.join(path))
.for_each(|path| {
assert!(path.exists(), "{} should exist.", path.display());
});
}
#[test]
fn test_exclude() {
let mut config = configure("test", &["A"], &["A"]);