diff options
| author | Simon Wülker <simon.wuelker@arcor.de> | 2025-03-13 11:28:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-13 10:28:11 +0000 |
| commit | bb0d08432ee87054bbbda2cdef977fc5a28ee8de (patch) | |
| tree | f0a71bb737927068212706eaf983c5f613eacb55 /components/allocator | |
| parent | eb2ca42824716faeab4cf31e275bb4136cc38e7d (diff) | |
| download | servo-bb0d08432ee87054bbbda2cdef977fc5a28ee8de.tar.gz servo-bb0d08432ee87054bbbda2cdef977fc5a28ee8de.zip | |
Migrate to the 2024 edition (#35755)
* Migrate to 2024 edition
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
* Allow unsafe_op_in_unsafe_fn lint
This lint warns by default in the 2024
edition, but is *way* too noisy for servo.
We might enable it in the future, but not now.
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
* Compile using the 2024 edition
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
---------
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
Diffstat (limited to 'components/allocator')
| -rw-r--r-- | components/allocator/Cargo.toml | 3 | ||||
| -rw-r--r-- | components/allocator/lib.rs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/components/allocator/Cargo.toml b/components/allocator/Cargo.toml index ce66c31833b..aadd23e4b81 100644 --- a/components/allocator/Cargo.toml +++ b/components/allocator/Cargo.toml @@ -23,3 +23,6 @@ windows-sys = { workspace = true, features = ["Win32_System_Memory"] } [target.'cfg(target_env = "ohos")'.dependencies] libc = { workspace = true } + +[lints.rust] +unsafe_op_in_unsafe_fn = { level = "allow" } diff --git a/components/allocator/lib.rs b/components/allocator/lib.rs index 13f1d876eae..ed9ed7fc5fe 100644 --- a/components/allocator/lib.rs +++ b/components/allocator/lib.rs @@ -21,7 +21,7 @@ mod platform { /// /// Passing a non-heap allocated pointer to this function results in undefined behavior. pub unsafe extern "C" fn usable_size(ptr: *const c_void) -> usize { - tikv_jemallocator::usable_size(ptr) + unsafe { tikv_jemallocator::usable_size(ptr) } } /// Memory allocation APIs compatible with libc |