From c063c0b616f1d34d615622d4194fbcd68afb4188 Mon Sep 17 00:00:00 2001 From: LingMan <18294-LingMan@users.noreply.gitlab.freedesktop.org> Date: Sun, 30 Nov 2025 05:44:48 +0100 Subject: [PATCH] rust: build `paste` 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: dde95fc039d ("meson,ci: Add the paste crate") Reviewed-by: Christian Gmeiner (cherry picked from commit f95a5d5df80662f9fb98d364107e149b1ce604ea) Part-of: --- .pick_status.json | 2 +- subprojects/packagefiles/paste-1-rs/meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0ab993958e7..71ab2d5daab 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -654,7 +654,7 @@ "description": "rust: build `paste` dependency with the correct edition", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "dde95fc039da8bc31563d6d85bfacd97be4ba98c", "notes": null diff --git a/subprojects/packagefiles/paste-1-rs/meson.build b/subprojects/packagefiles/paste-1-rs/meson.build index a2e58d1acf4..41720a2b1a8 100644 --- a/subprojects/packagefiles/paste-1-rs/meson.build +++ b/subprojects/packagefiles/paste-1-rs/meson.build @@ -9,7 +9,8 @@ rust = import('rust') lib = rust.proc_macro( 'paste', - files('src/lib.rs') + files('src/lib.rs'), + override_options : ['rust_std=2018', 'build.rust_std=2018'] ) dep_paste = declare_dependency(