mirror of https://github.com/rust-lang/rust.git
Rollup merge of #128491 - c410-f3r:unlock-rfc-2011, r=workingjubilee
[`macro_metavar_expr_concat`] Dogfooding cc #124225 Starts inner usage to test the robustness of the implementation.
This commit is contained in:
commit
55ed05cbac
|
@ -302,6 +302,7 @@
|
|||
#![feature(let_chains)]
|
||||
#![feature(link_cfg)]
|
||||
#![feature(linkage)]
|
||||
#![feature(macro_metavar_expr_concat)]
|
||||
#![feature(min_exhaustive_patterns)]
|
||||
#![feature(min_specialization)]
|
||||
#![feature(must_not_suspend)]
|
||||
|
|
|
@ -168,14 +168,7 @@ pub(crate) macro syscall {
|
|||
if let Some(fun) = $name.get() {
|
||||
fun($($arg_name),*)
|
||||
} else {
|
||||
// This looks like a hack, but concat_idents only accepts idents
|
||||
// (not paths).
|
||||
use libc::*;
|
||||
|
||||
syscall(
|
||||
concat_idents!(SYS_, $name),
|
||||
$($arg_name),*
|
||||
) as $ret
|
||||
libc::syscall(libc::${concat(SYS_, $name)}, $($arg_name),*) as $ret
|
||||
}
|
||||
}
|
||||
)
|
||||
|
@ -185,14 +178,7 @@ pub(crate) macro syscall {
|
|||
pub(crate) macro raw_syscall {
|
||||
(fn $name:ident($($arg_name:ident: $t:ty),*) -> $ret:ty) => (
|
||||
unsafe fn $name($($arg_name:$t),*) -> $ret {
|
||||
// This looks like a hack, but concat_idents only accepts idents
|
||||
// (not paths).
|
||||
use libc::*;
|
||||
|
||||
syscall(
|
||||
concat_idents!(SYS_, $name),
|
||||
$($arg_name),*
|
||||
) as $ret
|
||||
libc::syscall(libc::${concat(SYS_, $name)}, $($arg_name),*) as $ret
|
||||
}
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue