nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add dynamic_lib_extension and read_dir functions to run-make-support library

Browse Source
This commit is contained in:
Guillaume Gomez 2024-05-31 10:47:30 +02:00
parent a83cf567b5
commit 2416f460f8
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/tools/run-make-support/src/lib.rs
View File

@ -123,12 +123,23 @@ pub fn dynamic_lib_name(name: &str) -> String {
// ``` // ```
assert!(!name.contains(char::is_whitespace), "dynamic library name cannot contain whitespace"); assert!(!name.contains(char::is_whitespace), "dynamic library name cannot contain whitespace");
let extension = dynamic_lib_extension();
if is_darwin() { if is_darwin() {
format!("lib{name}.dylib") format!("lib{name}.{extension}")
} else if is_windows() { } else if is_windows() {
format!("{name}.dll") format!("{name}.{extension}")
} else { } else {
format!("lib{name}.so") format!("lib{name}.{extension}")
}
}
pub fn dynamic_lib_extension() -> &'static str {
if is_darwin() {
"dylib"
} else if is_windows() {
"dll"
} else {
"so"
} }
} }
@ -249,16 +260,13 @@ pub fn recursive_diff(dir1: impl AsRef<Path>, dir2: impl AsRef<Path>) {
} }
let dir2 = dir2.as_ref(); let dir2 = dir2.as_ref();
for entry in fs::read_dir(dir1).unwrap() { read_dir(dir1, |entry_path| {
let entry = entry.unwrap(); let entry_name = entry_path.file_name().unwrap();
let entry_name = entry.file_name(); if entry_path.is_dir() {
let path = entry.path(); recursive_diff(&entry_path, &dir2.join(entry_name));
if path.is_dir() {
recursive_diff(&path, &dir2.join(entry_name));
} else { } else {
let path2 = dir2.join(entry_name); let path2 = dir2.join(entry_name);
let file1 = read_file(&path); let file1 = read_file(&entry_path);
let file2 = read_file(&path2); let file2 = read_file(&path2);
// We don't use `assert_eq!` because they are `Vec<u8>`, so not great for display. // We don't use `assert_eq!` because they are `Vec<u8>`, so not great for display.
@ -267,10 +275,16 @@ pub fn recursive_diff(dir1: impl AsRef<Path>, dir2: impl AsRef<Path>) {
assert!( assert!(
file1 == file2, file1 == file2,
"`{}` and `{}` have different content", "`{}` and `{}` have different content",
path.display(), entry_path.display(),
path2.display(), path2.display(),
); );
} }
});
}
pub fn read_dir<F: Fn(&Path)>(dir: impl AsRef<Path>, callback: F) {
for entry in fs::read_dir(dir).unwrap() {
callback(&entry.unwrap().path());
} }
} }