Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26662 - servo:rustup, r=jdm

Browse source 
Partial preparations for upgrading to Rust nightly-2020-05-26

CC https://github.com/servo/servo/issues/26661
Fixes https://github.com/servo/servo/issues/26645
This commit is contained in:
bors-servo 2020-05-27 02:55:17 -04:00 • committed by GitHub
commit 34a41f57c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/derive_common/cg.rs
View file

@ -7,7 +7,7 @@ use proc_macro2::{Span, TokenStream};
use quote::TokenStreamExt;
use syn::{self, AngleBracketedGenericArguments, Binding, DeriveInput, Field};
use syn::{GenericArgument, GenericParam, Ident, Path};
use syn::{PathArguments, PathSegment, QSelf, Type, TypeArray};
use syn::{PathArguments, PathSegment, QSelf, Type, TypeArray, TypeGroup};
use syn::{TypeParam, TypeParen, TypePath, TypeSlice, TypeTuple};
use syn::{Variant, WherePredicate};
use synstructure::{self, BindStyle, BindingInfo, VariantAst, VariantInfo};
@ -187,6 +187,10 @@ where
elem: Box::new(map_type_params(&inner.elem, params, f)),
..inner.clone()
}),
Type::Group(ref inner) => Type::from(TypeGroup {
elem: Box::new(map_type_params(&inner.elem, params, f)),
..inner.clone()
}),
ref ty => panic!("type {:?} cannot be mapped yet", ty),
}
}