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;