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/fonts/platform | |
| 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/fonts/platform')
| -rw-r--r-- | components/fonts/platform/freetype/font.rs | 2 | ||||
| -rw-r--r-- | components/fonts/platform/freetype/font_list.rs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/components/fonts/platform/freetype/font.rs b/components/fonts/platform/freetype/font.rs index efa86fc3d64..7f4c1c1d026 100644 --- a/components/fonts/platform/freetype/font.rs +++ b/components/fonts/platform/freetype/font.rs @@ -573,7 +573,7 @@ struct TtHeader { glyph_data_format: FT_Short, } -extern "C" { +unsafe extern "C" { fn FT_Load_Sfnt_Table( face: FT_Face, tag: FT_ULong, diff --git a/components/fonts/platform/freetype/font_list.rs b/components/fonts/platform/freetype/font_list.rs index ce65933b312..68b1aa99e9d 100644 --- a/components/fonts/platform/freetype/font_list.rs +++ b/components/fonts/platform/freetype/font_list.rs @@ -293,7 +293,6 @@ fn font_weight_from_fontconfig_pattern(pattern: *mut FcPattern) -> Option<FontWe /// Creates a String from the given null-terminated buffer. /// Panics if the buffer does not contain UTF-8. unsafe fn c_str_to_string(s: *const c_char) -> String { - std::str::from_utf8(CStr::from_ptr(s).to_bytes()) - .unwrap() - .to_owned() + let c_str = unsafe { CStr::from_ptr(s) }; + std::str::from_utf8(c_str.to_bytes()).unwrap().to_owned() } |