Skip to content

Commit

Permalink
Rollup merge of #91906 - anuvratsingh:remove_in_band_lifetimes_librar…
Browse files Browse the repository at this point in the history
…y_proc_macro, r=petrochenkov

Removed `in_band_lifetimes` from `library\proc_macro`

Issue [#91867](#91867)

This is my first try, I followed the instructions given. Fixed all the errors that were thrown while compiling.
Compiled with stage 0,1, and 2 all of them compiled successfully.
  • Loading branch information
matthiaskrgr authored Dec 14, 2021
2 parents 0847115 + 90aa8fb commit 4750924
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions library/proc_macro/src/bridge/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ macro_rules! define_handles {
}
}

impl<S: server::Types> Decode<'_, 's, HandleStore<server::MarkedTypes<S>>>
impl<'s, S: server::Types> Decode<'_, 's, HandleStore<server::MarkedTypes<S>>>
for &'s Marked<S::$oty, $oty>
{
fn decode(r: &mut Reader<'_>, s: &'s HandleStore<server::MarkedTypes<S>>) -> Self {
Expand All @@ -92,7 +92,7 @@ macro_rules! define_handles {
}
}

impl<S: server::Types> DecodeMut<'_, 's, HandleStore<server::MarkedTypes<S>>>
impl<'s, S: server::Types> DecodeMut<'_, 's, HandleStore<server::MarkedTypes<S>>>
for &'s mut Marked<S::$oty, $oty>
{
fn decode(
Expand Down
8 changes: 4 additions & 4 deletions library/proc_macro/src/bridge/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,13 @@ impl<T, M> Unmark for Marked<T, M> {
self.value
}
}
impl<T, M> Unmark for &'a Marked<T, M> {
impl<'a, T, M> Unmark for &'a Marked<T, M> {
type Unmarked = &'a T;
fn unmark(self) -> Self::Unmarked {
&self.value
}
}
impl<T, M> Unmark for &'a mut Marked<T, M> {
impl<'a, T, M> Unmark for &'a mut Marked<T, M> {
type Unmarked = &'a mut T;
fn unmark(self) -> Self::Unmarked {
&mut self.value
Expand Down Expand Up @@ -356,8 +356,8 @@ mark_noop! {
(),
bool,
char,
&'a [u8],
&'a str,
&'_ [u8],
&'_ str,
String,
usize,
Delimiter,
Expand Down
8 changes: 4 additions & 4 deletions library/proc_macro/src/bridge/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ macro_rules! rpc_encode_decode {
}
}

impl<S, $($($T: for<'s> DecodeMut<'a, 's, S>),+)?> DecodeMut<'a, '_, S>
impl<'a, S, $($($T: for<'s> DecodeMut<'a, 's, S>),+)?> DecodeMut<'a, '_, S>
for $name $(<$($T),+>)?
{
fn decode(r: &mut Reader<'a>, s: &mut S) -> Self {
Expand Down Expand Up @@ -176,7 +176,7 @@ impl<S, A: Encode<S>, B: Encode<S>> Encode<S> for (A, B) {
}
}

impl<S, A: for<'s> DecodeMut<'a, 's, S>, B: for<'s> DecodeMut<'a, 's, S>> DecodeMut<'a, '_, S>
impl<'a, S, A: for<'s> DecodeMut<'a, 's, S>, B: for<'s> DecodeMut<'a, 's, S>> DecodeMut<'a, '_, S>
for (A, B)
{
fn decode(r: &mut Reader<'a>, s: &mut S) -> Self {
Expand Down Expand Up @@ -213,7 +213,7 @@ impl<S> Encode<S> for &[u8] {
}
}

impl<S> DecodeMut<'a, '_, S> for &'a [u8] {
impl<'a, S> DecodeMut<'a, '_, S> for &'a [u8] {
fn decode(r: &mut Reader<'a>, s: &mut S) -> Self {
let len = usize::decode(r, s);
let xs = &r[..len];
Expand All @@ -228,7 +228,7 @@ impl<S> Encode<S> for &str {
}
}

impl<S> DecodeMut<'a, '_, S> for &'a str {
impl<'a, S> DecodeMut<'a, '_, S> for &'a str {
fn decode(r: &mut Reader<'a>, s: &mut S) -> Self {
str::from_utf8(<&[u8]>::decode(r, s)).unwrap()
}
Expand Down
1 change: 0 additions & 1 deletion library/proc_macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#![feature(allow_internal_unstable)]
#![feature(decl_macro)]
#![feature(extern_types)]
#![feature(in_band_lifetimes)]
#![feature(negative_impls)]
#![feature(auto_traits)]
#![feature(restricted_std)]
Expand Down

0 comments on commit 4750924

Please sign in to comment.