nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete read_enum_variant names

Browse Source
This commit is contained in:
Mark Rousskov 2022-02-09 17:12:20 -05:00
parent c6bd6b444c
commit c87060a72d
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_macros/src/serialize.rs
View File

@ -60,13 +60,6 @@ fn decodable_body(
quote! { #idx => { #construct } } quote! { #idx => { #construct } }
}) })
.collect(); .collect();
let names: TokenStream = variants
.iter()
.map(|vi| {
let variant_name = vi.ast().ident.to_string();
quote!(#variant_name,)
})
.collect();
let message = format!( let message = format!(
"invalid enum variant tag while decoding `{}`, expected 0..{}", "invalid enum variant tag while decoding `{}`, expected 0..{}",
ty_name, ty_name,
@ -75,7 +68,6 @@ fn decodable_body(
quote! { quote! {
::rustc_serialize::Decoder::read_enum_variant( ::rustc_serialize::Decoder::read_enum_variant(
__decoder, __decoder,
&[#names],
|__decoder, __variant_idx| { |__decoder, __variant_idx| {
match __variant_idx { match __variant_idx {
#match_inner #match_inner

6
compiler/rustc_serialize/src/serialize.rs
View File

@ -202,7 +202,7 @@ pub trait Decoder {
fn read_raw_bytes_into(&mut self, s: &mut [u8]); fn read_raw_bytes_into(&mut self, s: &mut [u8]);
#[inline] #[inline]
fn read_enum_variant<T, F>(&mut self, _names: &[&str], mut f: F) -> T fn read_enum_variant<T, F>(&mut self, mut f: F) -> T
where where
F: FnMut(&mut Self, usize) -> T, F: FnMut(&mut Self, usize) -> T,
{ {
@ -255,7 +255,7 @@ pub trait Decoder {
where where
F: FnMut(&mut Self, bool) -> T, F: FnMut(&mut Self, bool) -> T,
{ {
self.read_enum_variant(&["None", "Some"], move |this, idx| match idx { self.read_enum_variant(move |this, idx| match idx {
0 => f(this, false), 0 => f(this, false),
1 => f(this, true), 1 => f(this, true),
_ => panic!("read_option: expected 0 for None or 1 for Some"), _ => panic!("read_option: expected 0 for None or 1 for Some"),
@ -571,7 +571,7 @@ impl<S: Encoder, T1: Encodable<S>, T2: Encodable<S>> Encodable<S> for Result<T1,
impl<D: Decoder, T1: Decodable<D>, T2: Decodable<D>> Decodable<D> for Result<T1, T2> { impl<D: Decoder, T1: Decodable<D>, T2: Decodable<D>> Decodable<D> for Result<T1, T2> {
fn decode(d: &mut D) -> Result<T1, T2> { fn decode(d: &mut D) -> Result<T1, T2> {
d.read_enum_variant(&["Ok", "Err"], |d, disr| match disr { d.read_enum_variant(|d, disr| match disr {
0 => Ok(d.read_enum_variant_arg(|d| T1::decode(d))), 0 => Ok(d.read_enum_variant_arg(|d| T1::decode(d))),
1 => Err(d.read_enum_variant_arg(|d| T2::decode(d))), 1 => Err(d.read_enum_variant_arg(|d| T2::decode(d))),
_ => panic!("Encountered invalid discriminant while decoding `Result`."), _ => panic!("Encountered invalid discriminant while decoding `Result`."),