Skip to content

Commit

Permalink
Unrolled build for rust-lang#121302
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#121302 - GrigorenkoPV:refmutl, r=bjorn3

Remove `RefMutL` hack in `proc_macro::bridge`

From what I can tell, rust-lang#52812 is now fixed, so there is no longer any need to keep this hack around.
  • Loading branch information
rust-timer authored Feb 20, 2024
2 parents 2b43e75 + 5be3d4b commit f9324d0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 26 deletions.
7 changes: 1 addition & 6 deletions library/proc_macro/src/bridge/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,7 @@ impl BridgeState<'_> {
/// N.B., while `f` is running, the thread-local state
/// is `BridgeState::InUse`.
fn with<R>(f: impl FnOnce(&mut BridgeState<'_>) -> R) -> R {
BRIDGE_STATE.with(|state| {
state.replace(BridgeState::InUse, |mut state| {
// FIXME(#52812) pass `f` directly to `replace` when `RefMutL` is gone
f(&mut *state)
})
})
BRIDGE_STATE.with(|state| state.replace(BridgeState::InUse, f))
}
}

Expand Down
22 changes: 2 additions & 20 deletions library/proc_macro/src/bridge/scoped_cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

use std::cell::Cell;
use std::mem;
use std::ops::{Deref, DerefMut};

/// Type lambda application, with a lifetime.
#[allow(unused_lifetimes)]
Expand All @@ -15,23 +14,6 @@ pub trait LambdaL: for<'a> ApplyL<'a> {}

impl<T: for<'a> ApplyL<'a>> LambdaL for T {}

// HACK(eddyb) work around projection limitations with a newtype
// FIXME(#52812) replace with `&'a mut <T as ApplyL<'b>>::Out`
pub struct RefMutL<'a, 'b, T: LambdaL>(&'a mut <T as ApplyL<'b>>::Out);

impl<'a, 'b, T: LambdaL> Deref for RefMutL<'a, 'b, T> {
type Target = <T as ApplyL<'b>>::Out;
fn deref(&self) -> &Self::Target {
self.0
}
}

impl<'a, 'b, T: LambdaL> DerefMut for RefMutL<'a, 'b, T> {
fn deref_mut(&mut self) -> &mut Self::Target {
self.0
}
}

pub struct ScopedCell<T: LambdaL>(Cell<<T as ApplyL<'static>>::Out>);

impl<T: LambdaL> ScopedCell<T> {
Expand All @@ -46,7 +28,7 @@ impl<T: LambdaL> ScopedCell<T> {
pub fn replace<'a, R>(
&self,
replacement: <T as ApplyL<'a>>::Out,
f: impl for<'b, 'c> FnOnce(RefMutL<'b, 'c, T>) -> R,
f: impl for<'b, 'c> FnOnce(&'b mut <T as ApplyL<'c>>::Out) -> R,
) -> R {
/// Wrapper that ensures that the cell always gets filled
/// (with the original state, optionally changed by `f`),
Expand All @@ -71,7 +53,7 @@ impl<T: LambdaL> ScopedCell<T> {
})),
};

f(RefMutL(put_back_on_drop.value.as_mut().unwrap()))
f(put_back_on_drop.value.as_mut().unwrap())
}

/// Sets the value in `self` to `value` while running `f`.
Expand Down

0 comments on commit f9324d0

Please sign in to comment.