From 3eb60e6dcad5658ec4ae3c0c5de598ec3b9ca305 Mon Sep 17 00:00:00 2001 From: LingMan <18294-LingMan@users.noreply.gitlab.freedesktop.org> Date: Sun, 30 Nov 2025 05:48:17 +0100 Subject: [PATCH] rust: build `ucd-trie` dependency with the correct edition Although a crate may happen to be compatible with multiple editions, building with the wrong edition can - generally speaking - lead to subtle bugs. There are no known failures in this case, but better to match the official Cargo.toml anyway. Fixes: e28ff818695 ("meson: Add pest rust dependencies") Reviewed-by: Christian Gmeiner Part-of: (cherry picked from commit 2044cf885b75ad017bba65554083d7e1e602f38e) --- .pick_status.json | 2 +- subprojects/packagefiles/ucd-trie-0.1-rs/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 71ab2d5daab..d5a514d8fd4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -644,7 +644,7 @@ "description": "rust: build `ucd-trie` dependency with the correct edition", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e28ff818695ca953b31ec15d1f371b64a4ff9e3d", "notes": null diff --git a/subprojects/packagefiles/ucd-trie-0.1-rs/meson.build b/subprojects/packagefiles/ucd-trie-0.1-rs/meson.build index e8b14387d4a..20ba4d9d02c 100644 --- a/subprojects/packagefiles/ucd-trie-0.1-rs/meson.build +++ b/subprojects/packagefiles/ucd-trie-0.1-rs/meson.build @@ -8,7 +8,7 @@ project( lib = static_library( 'ucd_trie', 'src/lib.rs', - override_options : ['rust_std=2018', 'build.rust_std=2018'], + override_options : ['rust_std=2021', 'build.rust_std=2021'], rust_abi : 'rust', native : true, )