nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

made compiler happy

Browse Source
This commit is contained in:
Anuvrat 2021-12-14 16:42:16 +05:30
parent 7ca74ea0af
commit 90aa8fb3d5
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {
@ -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(

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

@ -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
@ -356,8 +356,8 @@ mark_noop! {
(),
bool,
char,
&'a [u8],
&'a str,
&'_ [u8],
&'_ str,
String,
usize,
Delimiter,

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

@ -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 {
@ -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 {
@ -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];
@ -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()
}

1
library/proc_macro/src/lib.rs
View File

@ -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)]