diff --git a/platform/rust/build.rs b/platform/rust/build.rs index 2db9c70696f..eb6beb5fa2f 100644 --- a/platform/rust/build.rs +++ b/platform/rust/build.rs @@ -5,7 +5,7 @@ use std::path::PathBuf; fn main() { let project_root = { let manifest = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()); - let root = manifest.join("maplibre-native-src"); + let root = manifest.join("core-src"); if root.is_symlink() || root.is_dir() { // Use the symlinked directory to allow packaging root diff --git a/platform/rust/core-src/ARCHITECTURE.md b/platform/rust/core-src/ARCHITECTURE.md new file mode 120000 index 00000000000..9719fcb6afc --- /dev/null +++ b/platform/rust/core-src/ARCHITECTURE.md @@ -0,0 +1 @@ +../../../ARCHITECTURE.md \ No newline at end of file diff --git a/platform/rust/core-src/CHANGELOG.md b/platform/rust/core-src/CHANGELOG.md new file mode 120000 index 00000000000..79b747aee1b --- /dev/null +++ b/platform/rust/core-src/CHANGELOG.md @@ -0,0 +1 @@ +../../../CHANGELOG.md \ No newline at end of file diff --git a/platform/rust/core-src/CMakeLists.txt b/platform/rust/core-src/CMakeLists.txt new file mode 120000 index 00000000000..d8cd15fc627 --- /dev/null +++ b/platform/rust/core-src/CMakeLists.txt @@ -0,0 +1 @@ +../../../CMakeLists.txt \ No newline at end of file diff --git a/platform/rust/core-src/CODE-OF-CONDUCT.md b/platform/rust/core-src/CODE-OF-CONDUCT.md new file mode 120000 index 00000000000..8c2f303ee64 --- /dev/null +++ b/platform/rust/core-src/CODE-OF-CONDUCT.md @@ -0,0 +1 @@ +../../../CODE-OF-CONDUCT.md \ No newline at end of file diff --git a/platform/rust/core-src/CONTRIBUTING.md b/platform/rust/core-src/CONTRIBUTING.md new file mode 120000 index 00000000000..c97564d93a7 --- /dev/null +++ b/platform/rust/core-src/CONTRIBUTING.md @@ -0,0 +1 @@ +../../../CONTRIBUTING.md \ No newline at end of file diff --git a/platform/rust/core-src/LICENSE.md b/platform/rust/core-src/LICENSE.md new file mode 120000 index 00000000000..368ec7e5708 --- /dev/null +++ b/platform/rust/core-src/LICENSE.md @@ -0,0 +1 @@ +../../../LICENSE.md \ No newline at end of file diff --git a/platform/rust/core-src/LICENSES.core.md b/platform/rust/core-src/LICENSES.core.md new file mode 120000 index 00000000000..96e28c44ba4 --- /dev/null +++ b/platform/rust/core-src/LICENSES.core.md @@ -0,0 +1 @@ +../../../LICENSES.core.md \ No newline at end of file diff --git a/platform/rust/core-src/README.md b/platform/rust/core-src/README.md new file mode 120000 index 00000000000..8a33348c7d8 --- /dev/null +++ b/platform/rust/core-src/README.md @@ -0,0 +1 @@ +../../../README.md \ No newline at end of file diff --git a/platform/rust/core-src/SECURITY.md b/platform/rust/core-src/SECURITY.md new file mode 120000 index 00000000000..7f933119f6d --- /dev/null +++ b/platform/rust/core-src/SECURITY.md @@ -0,0 +1 @@ +../../../SECURITY.md \ No newline at end of file diff --git a/platform/rust/core-src/include b/platform/rust/core-src/include new file mode 120000 index 00000000000..8a5dba6c4b5 --- /dev/null +++ b/platform/rust/core-src/include @@ -0,0 +1 @@ +../../../include \ No newline at end of file diff --git a/platform/rust/core-src/rustutils b/platform/rust/core-src/rustutils new file mode 120000 index 00000000000..f353de72512 --- /dev/null +++ b/platform/rust/core-src/rustutils @@ -0,0 +1 @@ +../../../rustutils \ No newline at end of file diff --git a/platform/rust/core-src/scripts b/platform/rust/core-src/scripts new file mode 120000 index 00000000000..bbaa944cf4d --- /dev/null +++ b/platform/rust/core-src/scripts @@ -0,0 +1 @@ +../../../scripts \ No newline at end of file diff --git a/platform/rust/core-src/shaders b/platform/rust/core-src/shaders new file mode 120000 index 00000000000..365f0dfd1c0 --- /dev/null +++ b/platform/rust/core-src/shaders @@ -0,0 +1 @@ +../../../shaders \ No newline at end of file diff --git a/platform/rust/core-src/src b/platform/rust/core-src/src new file mode 120000 index 00000000000..dabb0e15a99 --- /dev/null +++ b/platform/rust/core-src/src @@ -0,0 +1 @@ +../../../src \ No newline at end of file diff --git a/platform/rust/core-src/vendor b/platform/rust/core-src/vendor new file mode 120000 index 00000000000..c73e2c9ac07 --- /dev/null +++ b/platform/rust/core-src/vendor @@ -0,0 +1 @@ +../../../vendor \ No newline at end of file diff --git a/platform/rust/maplibre-native-src b/platform/rust/maplibre-native-src deleted file mode 120000 index c25bddb6dd4..00000000000 --- a/platform/rust/maplibre-native-src +++ /dev/null @@ -1 +0,0 @@ -../.. \ No newline at end of file diff --git a/platform/rust/src/lib.rs b/platform/rust/src/lib.rs index 110d6cc99b7..e47d74f11c2 100644 --- a/platform/rust/src/lib.rs +++ b/platform/rust/src/lib.rs @@ -17,7 +17,7 @@ mod ffi { } /// A safe Rust wrapper so you can call `ceil_log2` from your code: -pub fn our_log(x: u64) -> u32 { +pub fn ceil_log2(x: u64) -> u32 { ffi::ceil_log2(x) } @@ -26,13 +26,13 @@ mod tests { use super::*; #[test] fn test_log2() { - let result = our_log(1); + let result = ceil_log2(1); assert_eq!(result, 0, "log2(1) = 0 bits needed"); - let result = our_log(2); + let result = ceil_log2(2); assert_eq!(result, 1, "log2(2) = 1 bit needed"); - let result = our_log(3); + let result = ceil_log2(3); assert_eq!(result, 2, "log2(3) -> 2 bits needed"); } }