Skip to content

Commit 101af2e

Browse files
KavyaSree2610Kavya Sree Kaitepalli
KavyaSree2610
and
Kavya Sree Kaitepalli
authored
rust: Upgrade to 1.90.0 (#14819)
Co-authored-by: Kavya Sree Kaitepalli <kkaitepalli@microsoft.com>
1 parent 6fc41d0 commit 101af2e

15 files changed

Lines changed: 198 additions & 66 deletions

File tree

‎SPECS-EXTENDED/389-ds-base/389-ds-base.spec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ExcludeArch: i686
6868
Summary: 389 Directory Server (%{variant})
6969
Name: 389-ds-base
7070
Version: 3.1.1
71-
Release: 8%{?dist}
71+
Release: 9%{?dist}
7272
License: GPL-3.0-or-later AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0
7373
URL: https://www.port389.org
7474
Vendor: Microsoft Corporation
@@ -83,6 +83,7 @@ Source4: 389-ds-base.sysusers
8383
Source5: https://fedorapeople.org/groups/389ds/libdb-5.3.28-59.tar.bz2
8484
%endif
8585

86+
Patch0: rust-1.90-fixes.patch
8687
Provides: ldif2ldbm >= 0
8788

8889
# Attach the buildrequires to the top level package:
@@ -732,6 +733,10 @@ exit 0
732733
%endif
733734

734735
%changelog
736+
* Tue Jan 13 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 3.1.1-9
737+
- Bump release to rebuild with rust
738+
- Add patch add explicit lifetime for ValueArrayRef iterator
739+
735740
* Tue Jan 06 2026 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.1.1-8
736741
- Bumping release to rebuild with new 'net-snmp' libs.
737742

‎SPECS-EXTENDED/389-ds-base/rust-1.90-fixes.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 3a0d6ff3272c4a3d5f2d552a436e4f0fe0756a0a Mon Sep 17 00:00:00 2001
2+
From: Kavya Sree Kaitepalli <kkaitepalli@microsoft.com>
3+
Date: Wed, 29 Oct 2025 06:38:08 +0000
4+
Subject: [PATCH] Add explicit lifetime for ValueArrayRef iterator for Rust 1.90
5+
6+
---
7+
src/slapi_r_plugin/src/value.rs | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/slapi_r_plugin/src/value.rs b/src/slapi_r_plugin/src/value.rs
11+
index 2fd35c8..fec74ac 100644
12+
--- a/src/slapi_r_plugin/src/value.rs
13+
+++ b/src/slapi_r_plugin/src/value.rs
14+
@@ -61,7 +61,7 @@ impl ValueArrayRef {
15+
ValueArrayRef { raw_slapi_val }
16+
}
17+
18+
- pub fn iter(&self) -> ValueArrayRefIter {
19+
+ pub fn iter(&self) -> ValueArrayRefIter<'_> {
20+
ValueArrayRefIter {
21+
idx: 0,
22+
va_ref: &self,
23+
--
24+
2.45.4
25+

‎SPECS-EXTENDED/ripgrep/ripgrep.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
Name: ripgrep
2222
Version: 13.0.0
23-
Release: 10%{?dist}
23+
Release: 11%{?dist}
2424
Summary: A search tool that combines ag with grep
2525
License: MIT AND Unlicense
2626
Vendor: Microsoft Corporation
@@ -104,6 +104,9 @@ install -Dm 644 complete/_rg %{buildroot}%{_datadir}/zsh/site-functions/_rg
104104
%{_datadir}/zsh
105105

106106
%changelog
107+
* Wed Oct 15 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 13.0.0-11
108+
- Bump release to rebuild with rust
109+
107110
* Fri Aug 08 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 13.0.0-10
108111
- Bump release to rebuild with rust
109112

‎SPECS-EXTENDED/rust-cbindgen/rust-cbindgen.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: Tool for generating C bindings to Rust code
33
Name: rust-cbindgen
44
Version: 0.24.3
5-
Release: 6%{?dist}
5+
Release: 7%{?dist}
66
License: MIT
77
Vendor: Microsoft Corporation
88
Distribution: Azure Linux
@@ -96,6 +96,9 @@ RUSTFLAGS=%{rustflags} cargo test --release
9696
%endif
9797

9898
%changelog
99+
* Wed Oct 15 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 0.24.3-7
100+
- Bump release to rebuild with rust
101+
99102
* Fri Aug 08 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 0.24.3-6
100103
- Bump release to rebuild with rust
101104

‎SPECS-EXTENDED/tardev-snapshotter/tardev-snapshotter.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Tardev Snapshotter for containerd
44
Name: tardev-snapshotter
55
Version: 3.2.0.tardev1
6-
Release: 4%{?dist}
6+
Release: 5%{?dist}
77
License: ASL 2.0
88
Group: Tools/Container
99
Vendor: Microsoft Corporation
@@ -67,6 +67,9 @@ fi
6767
%config(noreplace) %{_unitdir}/%{name}.service
6868

6969
%changelog
70+
* Wed Oct 15 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 3.2.0.tardev1-5
71+
- Bump release to rebuild with rust
72+
7073
* Fri Aug 08 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 3.2.0.tardev1-4
7174
- Bump release to rebuild with rust
7275

‎SPECS/cloud-hypervisor/cloud-hypervisor.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Name: cloud-hypervisor
66
Summary: Cloud Hypervisor is an open source Virtual Machine Monitor (VMM) that runs on top of the KVM hypervisor and the Microsoft Hypervisor (MSHV).
77
Version: 41.0.139
8-
Release: 1%{?dist}
8+
Release: 3%{?dist}
99
License: ASL 2.0 OR BSD-3-clause
1010
Vendor: Microsoft Corporation
1111
Distribution: Azure Linux
@@ -137,6 +137,9 @@ cargo build --release --target=%{rust_musl_target} %{cargo_pkg_feature_opts} %{c
137137
%license LICENSES/CC-BY-4.0.txt
138138

139139
%changelog
140+
* Wed Oct 15 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 41.0.139-3
141+
- Bump release to rebuild with rust
142+
140143
* Thu Oct 09 2025 Saul Paredes <saulparedes@microsoft.com> - 41.0.139-2
141144
- Enable build on aarch64
142145

‎SPECS/kata-containers-cc/kata-containers-cc.spec‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
Name: kata-containers-cc
55
Version: 3.15.0.aks0
6-
Release: 5%{?dist}
6+
Release: 6%{?dist}
77
Summary: Kata Confidential Containers package developed for Confidential Containers on AKS
88
License: ASL 2.0
99
URL: https://github.com/microsoft/kata-containers
1010
Vendor: Microsoft Corporation
1111
Distribution: Azure Linux
1212
Source0: https://github.com/microsoft/kata-containers/archive/refs/tags/%{version}.tar.gz#/%{sourceName}-%{version}.tar.gz
1313
Source1: %{sourceName}-%{version}-cargo.tar.gz
14-
14+
Patch0: rust-1.90-fixes.patch
1515
ExclusiveArch: x86_64
1616

1717
BuildRequires: azurelinux-release
@@ -150,6 +150,10 @@ fi
150150
%{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
151151

152152
%changelog
153+
* Wed Oct 15 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 3.15.0-aks0-6
154+
- Bump release to rebuild with rust
155+
- Add patch to suppress dead_code warnings and add explicit lifetime for U32Set iterator
156+
153157
* Fri Aug 08 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 3.15.0-aks0-5
154158
- Bump release to rebuild with rust
155159

‎SPECS/kata-containers-cc/rust-1.90-fixes.patch‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 40df9e0f016e4ce67e90e3e7f5b0ec87c5cb0a32 Mon Sep 17 00:00:00 2001
2+
From: Kavya Sree Kaitepalli <kkaitepalli@microsoft.com>
3+
Date: Tue, 28 Oct 2025 17:39:43 +0000
4+
Subject: [PATCH] Suppress dead_code warnings and add explicit lifetime for U32Set iterator for Rust 1.90
5+
6+
---
7+
src/agent/src/device/block_device_handler.rs | 1 +
8+
src/agent/src/storage/block_handler.rs | 1 +
9+
src/libs/kata-types/src/utils/u32_set.rs | 2 +-
10+
3 files changed, 3 insertions(+), 1 deletion(-)
11+
12+
diff --git a/src/agent/src/device/block_device_handler.rs b/src/agent/src/device/block_device_handler.rs
13+
index d518f9d..8607751 100644
14+
--- a/src/agent/src/device/block_device_handler.rs
15+
+++ b/src/agent/src/device/block_device_handler.rs
16+
@@ -29,6 +29,7 @@ use tracing::instrument;
17+
pub struct VirtioBlkPciDeviceHandler {}
18+
19+
#[derive(Debug)]
20+
+#[allow(dead_code)]
21+
pub struct VirtioBlkCcwDeviceHandler {}
22+
23+
#[derive(Debug)]
24+
diff --git a/src/agent/src/storage/block_handler.rs b/src/agent/src/storage/block_handler.rs
25+
index 251a4df..074efc3 100644
26+
--- a/src/agent/src/storage/block_handler.rs
27+
+++ b/src/agent/src/storage/block_handler.rs
28+
@@ -94,6 +94,7 @@ impl StorageHandler for VirtioBlkPciHandler {
29+
}
30+
31+
#[derive(Debug)]
32+
+#[allow(dead_code)]
33+
pub struct VirtioBlkCcwHandler {}
34+
35+
#[async_trait::async_trait]
36+
diff --git a/src/libs/kata-types/src/utils/u32_set.rs b/src/libs/kata-types/src/utils/u32_set.rs
37+
index 44c55a1..837e7a0 100644
38+
--- a/src/libs/kata-types/src/utils/u32_set.rs
39+
+++ b/src/libs/kata-types/src/utils/u32_set.rs
40+
@@ -47,7 +47,7 @@ impl U32Set {
41+
}
42+
43+
/// Get an iterator over the CPU set.
44+
- pub fn iter(&self) -> Iter<u32> {
45+
+ pub fn iter(&self) -> Iter<'_, u32> {
46+
self.0.iter()
47+
}
48+
}
49+
--
50+
2.45.4
51+

‎SPECS/kata-containers/kata-containers.spec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
Name: kata-containers
44
Version: 3.19.1.kata2
5-
Release: 2%{?dist}
5+
Release: 3%{?dist}
66
Summary: Kata Containers package developed for Pod Sandboxing on AKS
77
License: ASL 2.0
88
URL: https://github.com/microsoft/kata-containers
99
Vendor: Microsoft Corporation
1010
Distribution: Azure Linux
1111
Source0: https://github.com/microsoft/kata-containers/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
1212
Source1: %{name}-%{version}-cargo.tar.gz
13+
Patch0: rust-1.90-fixes.patch
1314

1415
BuildRequires: azurelinux-release
1516
BuildRequires: golang
@@ -113,6 +114,10 @@ popd
113114
%{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
114115

115116
%changelog
117+
* Wed Oct 15 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 3.19.1.kata2-3
118+
- Bump release to rebuild with rust
119+
- Add patch to suppress dead_code warnings and add explicit lifetime for U32Set iterator
120+
116121
* Thu Oct 09 2025 Saul Paredes <saulparedes@microsoft.com> - 3.19.1.kata2-2
117122
- Enable build on aarch64
118123

‎SPECS/kata-containers/rust-1.90-fixes.patch‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 40df9e0f016e4ce67e90e3e7f5b0ec87c5cb0a32 Mon Sep 17 00:00:00 2001
2+
From: Kavya Sree Kaitepalli <kkaitepalli@microsoft.com>
3+
Date: Tue, 28 Oct 2025 17:39:43 +0000
4+
Subject: [PATCH] Suppress dead_code warnings and add explicit lifetime for U32Set iterator for Rust 1.90
5+
6+
---
7+
src/agent/src/device/block_device_handler.rs | 1 +
8+
src/agent/src/storage/block_handler.rs | 1 +
9+
src/libs/kata-types/src/utils/u32_set.rs | 2 +-
10+
3 files changed, 3 insertions(+), 1 deletion(-)
11+
12+
diff --git a/src/agent/src/device/block_device_handler.rs b/src/agent/src/device/block_device_handler.rs
13+
index d518f9d..8607751 100644
14+
--- a/src/agent/src/device/block_device_handler.rs
15+
+++ b/src/agent/src/device/block_device_handler.rs
16+
@@ -29,6 +29,7 @@ use tracing::instrument;
17+
pub struct VirtioBlkPciDeviceHandler {}
18+
19+
#[derive(Debug)]
20+
+#[allow(dead_code)]
21+
pub struct VirtioBlkCcwDeviceHandler {}
22+
23+
#[derive(Debug)]
24+
diff --git a/src/agent/src/storage/block_handler.rs b/src/agent/src/storage/block_handler.rs
25+
index 251a4df..074efc3 100644
26+
--- a/src/agent/src/storage/block_handler.rs
27+
+++ b/src/agent/src/storage/block_handler.rs
28+
@@ -94,6 +94,7 @@ impl StorageHandler for VirtioBlkPciHandler {
29+
}
30+
31+
#[derive(Debug)]
32+
+#[allow(dead_code)]
33+
pub struct VirtioBlkCcwHandler {}
34+
35+
#[async_trait::async_trait]
36+
diff --git a/src/libs/kata-types/src/utils/u32_set.rs b/src/libs/kata-types/src/utils/u32_set.rs
37+
index 44c55a1..837e7a0 100644
38+
--- a/src/libs/kata-types/src/utils/u32_set.rs
39+
+++ b/src/libs/kata-types/src/utils/u32_set.rs
40+
@@ -47,7 +47,7 @@ impl U32Set {
41+
}
42+
43+
/// Get an iterator over the CPU set.
44+
- pub fn iter(&self) -> Iter<u32> {
45+
+ pub fn iter(&self) -> Iter<'_, u32> {
46+
self.0.iter()
47+
}
48+
}
49+
--
50+
2.45.4
51+

0 commit comments

Comments
 (0)