From 6e7eaf0f098b6f729381bf4bbd1e59440733471c Mon Sep 17 00:00:00 2001 From: Zach Schuermann Date: Fri, 28 Feb 2025 15:19:38 -0800 Subject: [PATCH 1/3] MSRV fix: pin idna_adapter version --- kernel/Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 886ba3c60..69d7fcd8c 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -47,6 +47,10 @@ thiserror = "1" # only for structured logging tracing = { version = "0.1", features = ["log"] } url = "2" +# force URL to use unicode-rs instead of ICU4X otherwise we require MSRV 1.81 +# from docs: compared to ICU4X, this makes build times faster, MSRV lower, binary size larger, and +# run-time performance slower. +idna_adapter = "=1.1.0" uuid = "1.10.0" z85 = "3.0.5" From 7090084fd6142d26e36a1b0d2a40026f77f9554a Mon Sep 17 00:00:00 2001 From: Zach Schuermann Date: Fri, 28 Feb 2025 17:12:13 -0800 Subject: [PATCH 2/3] fix url pinning --- kernel/Cargo.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 4dc6f8149..16cfe0438 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -46,13 +46,15 @@ serde_json = "1" thiserror = "1" # only for structured logging tracing = { version = "0.1", features = ["log"] } -url = "2" +uuid = "1.10.0" +z85 = "3.0.5" + # force URL to use unicode-rs instead of ICU4X otherwise we require MSRV 1.81 # from docs: compared to ICU4X, this makes build times faster, MSRV lower, binary size larger, and # run-time performance slower. +[dependencies.url] +version = "2" idna_adapter = "=1.1.0" -uuid = "1.10.0" -z85 = "3.0.5" # bring in our derive macros delta_kernel_derive = { path = "../derive-macros", version = "0.7.0" } From 77adb15168644b972216d5cfc0cd4cb4e5d891fa Mon Sep 17 00:00:00 2001 From: Zach Schuermann Date: Fri, 28 Feb 2025 17:15:49 -0800 Subject: [PATCH 3/3] fix? --- kernel/Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 16cfe0438..4c830a7a7 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -49,13 +49,6 @@ tracing = { version = "0.1", features = ["log"] } uuid = "1.10.0" z85 = "3.0.5" -# force URL to use unicode-rs instead of ICU4X otherwise we require MSRV 1.81 -# from docs: compared to ICU4X, this makes build times faster, MSRV lower, binary size larger, and -# run-time performance slower. -[dependencies.url] -version = "2" -idna_adapter = "=1.1.0" - # bring in our derive macros delta_kernel_derive = { path = "../derive-macros", version = "0.7.0" } @@ -150,6 +143,13 @@ integration-test = [ [dependencies.home] version = "=0.5.9" +# force URL to use unicode-rs instead of ICU4X otherwise we require MSRV 1.81 +# from docs: compared to ICU4X, this makes build times faster, MSRV lower, binary size larger, and +# run-time performance slower. +[dependencies.url] +version = "2" +idna_adapter = "=1.1.0" + [build-dependencies] rustc_version = "0.4.1"