nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 18:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #131772 - GnomedDev:remove-proc_macro-todo, r=petrochenkov

Browse Source 
Remove `const_refs_to_static` TODO in proc_macro

Noticed this TODO, and with `const_refs_to_static` being stable now we can sort it out.
This commit is contained in:
Matthias Krüger 2024-10-19 22:00:56 +02:00 committed by GitHub
commit e0b8e787c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/proc_macro/src/bridge/client.rs
View File

@ -18,17 +18,10 @@ macro_rules! define_client_handles {
$(pub(super) $ity: AtomicU32,)* $(pub(super) $ity: AtomicU32,)*
} }
impl HandleCounters {
// FIXME(eddyb) use a reference to the `static COUNTERS`, instead of
// a wrapper `fn` pointer, once `const fn` can reference `static`s.
extern "C" fn get() -> &'static Self {
static COUNTERS: HandleCounters = HandleCounters { static COUNTERS: HandleCounters = HandleCounters {
$($oty: AtomicU32::new(1),)* $($oty: AtomicU32::new(1),)*
$($ity: AtomicU32::new(1),)* $($ity: AtomicU32::new(1),)*
}; };
&COUNTERS
}
}
$( $(
pub(crate) struct $oty { pub(crate) struct $oty {
@ -259,9 +252,7 @@ pub(crate) fn is_available() -> bool {
/// and forcing the use of APIs that take/return `S::TokenStream`, server-side. /// and forcing the use of APIs that take/return `S::TokenStream`, server-side.
#[repr(C)] #[repr(C)]
pub struct Client<I, O> { pub struct Client<I, O> {
// FIXME(eddyb) use a reference to the `static COUNTERS`, instead of pub(super) handle_counters: &'static HandleCounters,
// a wrapper `fn` pointer, once `const fn` can reference `static`s.
pub(super) get_handle_counters: extern "C" fn() -> &'static HandleCounters,
pub(super) run: extern "C" fn(BridgeConfig<'_>) -> Buffer, pub(super) run: extern "C" fn(BridgeConfig<'_>) -> Buffer,
@ -346,7 +337,7 @@ fn run_client<A: for<'a, 's> DecodeMut<'a, 's, ()>, R: Encode<()>>(
impl Client<crate::TokenStream, crate::TokenStream> { impl Client<crate::TokenStream, crate::TokenStream> {
pub const fn expand1(f: impl Fn(crate::TokenStream) -> crate::TokenStream + Copy) -> Self { pub const fn expand1(f: impl Fn(crate::TokenStream) -> crate::TokenStream + Copy) -> Self {
Client { Client {
get_handle_counters: HandleCounters::get, handle_counters: &COUNTERS,
run: super::selfless_reify::reify_to_extern_c_fn_hrt_bridge(move |bridge| { run: super::selfless_reify::reify_to_extern_c_fn_hrt_bridge(move |bridge| {
run_client(bridge, |input| f(crate::TokenStream(Some(input))).0) run_client(bridge, |input| f(crate::TokenStream(Some(input))).0)
}), }),
@ -360,7 +351,7 @@ impl Client<(crate::TokenStream, crate::TokenStream), crate::TokenStream> {
f: impl Fn(crate::TokenStream, crate::TokenStream) -> crate::TokenStream + Copy, f: impl Fn(crate::TokenStream, crate::TokenStream) -> crate::TokenStream + Copy,
) -> Self { ) -> Self {
Client { Client {
get_handle_counters: HandleCounters::get, handle_counters: &COUNTERS,
run: super::selfless_reify::reify_to_extern_c_fn_hrt_bridge(move |bridge| { run: super::selfless_reify::reify_to_extern_c_fn_hrt_bridge(move |bridge| {
run_client(bridge, |(input, input2)| { run_client(bridge, |(input, input2)| {
f(crate::TokenStream(Some(input)), crate::TokenStream(Some(input2))).0 f(crate::TokenStream(Some(input)), crate::TokenStream(Some(input2))).0

8
library/proc_macro/src/bridge/server.rs
View File

@ -400,10 +400,10 @@ impl client::Client<crate::TokenStream, crate::TokenStream> {
S: Server, S: Server,
S::TokenStream: Default, S::TokenStream: Default,
{ {
let client::Client { get_handle_counters, run, _marker } = *self; let client::Client { handle_counters, run, _marker } = *self;
run_server( run_server(
strategy, strategy,
get_handle_counters(), handle_counters,
server, server,
<MarkedTypes<S> as Types>::TokenStream::mark(input), <MarkedTypes<S> as Types>::TokenStream::mark(input),
run, run,
@ -426,10 +426,10 @@ impl client::Client<(crate::TokenStream, crate::TokenStream), crate::TokenStream
S: Server, S: Server,
S::TokenStream: Default, S::TokenStream: Default,
{ {
let client::Client { get_handle_counters, run, _marker } = *self; let client::Client { handle_counters, run, _marker } = *self;
run_server( run_server(
strategy, strategy,
get_handle_counters(), handle_counters,
server, server,
( (
<MarkedTypes<S> as Types>::TokenStream::mark(input), <MarkedTypes<S> as Types>::TokenStream::mark(input),