From 05f80e68415b38088a83586f2534b19794cac3f5 Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Sat, 4 Oct 2025 16:08:14 +0200
Subject: [PATCH] Replace removed nightly features.

---
 net/alxd/src/device/mod.rs | 12 ++++++------
 net/alxd/src/main.rs       |  3 ++-
 pcid/src/main.rs           |  1 -
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net/alxd/src/device/mod.rs b/net/alxd/src/device/mod.rs
index 8dcfc3192d..28719dd7d1 100644
--- a/net/alxd/src/device/mod.rs
+++ b/net/alxd/src/device/mod.rs
@@ -127,27 +127,27 @@ const ADVERTISE_1000FULL: u32 = 0x0200;
 
 macro_rules! FIELD_GETX {
     ($x:expr, $name:ident) => {
-        ((($x) >> concat_idents!($name, _SHIFT)) & concat_idents!($name, _MASK))
+        ((($x) >> ${concat($name, _SHIFT)} & ${concat($name, _MASK)}))
     };
 }
 
 macro_rules! FIELDX {
     ($name:ident, $v:expr) => {
-        (((($v) as u32) & concat_idents!($name, _MASK)) << concat_idents!($name, _SHIFT))
+        (((($v) as u32) & ${concat($name, _MASK)}) << ${concat($name, _SHIFT)})
     };
 }
 
 macro_rules! FIELD_SETS {
     ($x:expr, $name:ident, $v:expr) => {{
-        ($x) = (($x) & !(concat_idents!($name, _MASK) << concat_idents!($name, _SHIFT)))
-            | (((($v) as u16) & concat_idents!($name, _MASK)) << concat_idents!($name, _SHIFT))
+        ($x) = (($x) & !(${concat($name, _MASK)} << ${concat($name, _SHIFT)}))
+            | (((($v) as u16) & ${concat($name, _MASK)}) << ${concat($name, _SHIFT)})
     }};
 }
 
 macro_rules! FIELD_SET32 {
     ($x:expr, $name:ident, $v:expr) => {{
-        ($x) = (($x) & !(concat_idents!($name, _MASK) << concat_idents!($name, _SHIFT)))
-            | (((($v) as u32) & concat_idents!($name, _MASK)) << concat_idents!($name, _SHIFT))
+        ($x) = (($x) & !(${concat($name, _MASK)} << ${concat($name, _SHIFT)}))
+            | (((($v) as u32) & ${concat($name, _MASK)}) << ${concat($name, _SHIFT)})
     }};
 }
 
diff --git a/net/alxd/src/main.rs b/net/alxd/src/main.rs
index f87d256dba..5a9223ee04 100644
--- a/net/alxd/src/main.rs
+++ b/net/alxd/src/main.rs
@@ -1,7 +1,8 @@
+#![feature(macro_metavar_expr_concat)]
+
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 #![allow(unused_parens)]
-#![feature(concat_idents)]
 
 extern crate event;
 extern crate syscall;
diff --git a/pcid/src/main.rs b/pcid/src/main.rs
index bbfb8ba301..c06e583c63 100644
--- a/pcid/src/main.rs
+++ b/pcid/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(array_chunks)]
 #![feature(non_exhaustive_omitted_patterns_lint)]
 #![feature(iter_next_chunk)]
 #![feature(if_let_guard)]