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

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

Browse source 
CC https://github.com/servo/servo/issues/26661
Fixes https://github.com/servo/servo/issues/26645
This commit is contained in:
Simon Sapin 2020-05-26 13:01:49 +02:00
parent f3313739f5
commit cfd62cf8dc
3 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Cargo.lock generated
View file

@ -280,7 +280,7 @@ dependencies = [
"lazycell", "lazycell",
"log", "log",
"peeking_take_while", "peeking_take_while",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"regex", "regex",
"rustc-hash", "rustc-hash",
@ -572,7 +572,7 @@ dependencies = [
"clap", "clap",
"heck", "heck",
"log", "log",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"serde", "serde",
"serde_json", "serde_json",
@ -1035,7 +1035,7 @@ dependencies = [
"itoa", "itoa",
"matches", "matches",
"phf", "phf",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"serde", "serde",
"smallvec 1.3.0", "smallvec 1.3.0",
@ -1101,7 +1101,7 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
dependencies = [ dependencies = [
"fnv", "fnv",
"ident_case", "ident_case",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -1175,7 +1175,7 @@ name = "derive_common"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
"synstructure", "synstructure",
@ -1187,7 +1187,7 @@ version = "0.99.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8" checksum = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -1303,7 +1303,7 @@ dependencies = [
name = "domobject_derive" name = "domobject_derive"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -1452,7 +1452,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1df9d0cef4b051baf3ef7f9b1674273dc78cd56e02cba60fa187f9c0ff4ff5e0" checksum = "1df9d0cef4b051baf3ef7f9b1674273dc78cd56e02cba60fa187f9c0ff4ff5e0"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -1684,7 +1684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
dependencies = [ dependencies = [
"proc-macro-hack", "proc-macro-hack",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -2514,7 +2514,7 @@ dependencies = [
"log", "log",
"mac", "mac",
"markup5ever", "markup5ever",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -2803,7 +2803,7 @@ dependencies = [
name = "jstraceable_derive" name = "jstraceable_derive"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"syn", "syn",
"synstructure", "synstructure",
] ]
@ -3303,7 +3303,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b" checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"syn", "syn",
"synstructure", "synstructure",
] ]
@ -3748,7 +3748,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746" checksum = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -3992,7 +3992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5"
dependencies = [ dependencies = [
"proc-macro-hack", "proc-macro-hack",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -4039,7 +4039,7 @@ name = "peek-poke-derive"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/servo/webrender#01082a9091ab98c392af8934d04271eb1dd546df" source = "git+https://github.com/servo/webrender#01082a9091ab98c392af8934d04271eb1dd546df"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
"synstructure", "synstructure",
@ -4052,7 +4052,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fb44a25c5bba983be0fc8592dfaf3e6d0935ce8be0c6b15b2a39507af34a926" checksum = "6fb44a25c5bba983be0fc8592dfaf3e6d0935ce8be0c6b15b2a39507af34a926"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
"synstructure", "synstructure",
@ -4121,7 +4121,7 @@ dependencies = [
"phf_generator", "phf_generator",
"phf_shared", "phf_shared",
"proc-macro-hack", "proc-macro-hack",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -4222,9 +4222,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.1" version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802" checksum = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101"
dependencies = [ dependencies = [
"unicode-xid 0.2.0", "unicode-xid 0.2.0",
] ]
@ -4301,7 +4301,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
] ]
[[package]] [[package]]
@ -4857,7 +4857,7 @@ version = "1.0.110"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984" checksum = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -5182,7 +5182,7 @@ name = "servo_config_plugins"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"itertools", "itertools",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -5203,7 +5203,7 @@ name = "servo_media_derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686" source = "git+https://github.com/servo/media#62cd58a94c54e8d9ff3845f263356e242e951686"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
] ]
@ -5511,7 +5511,7 @@ checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
dependencies = [ dependencies = [
"phf_generator", "phf_generator",
"phf_shared", "phf_shared",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
] ]
@ -5585,7 +5585,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"darling", "darling",
"derive_common", "derive_common",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
"synstructure", "synstructure",
@ -5701,11 +5701,11 @@ checksum = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb"
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.3" version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "158521e6f544e7e3dcfc370ac180794aa38cb34a1b1e07609376d4adcf429b93" checksum = "2010dd20d6200209c24f17022e34c73b8e79fb42180f8c9ca970a8dbc44acc8c"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"unicode-xid 0.2.0", "unicode-xid 0.2.0",
] ]
@ -5716,7 +5716,7 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
"unicode-xid 0.2.0", "unicode-xid 0.2.0",
@ -5861,7 +5861,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"darling", "darling",
"derive_common", "derive_common",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
"synstructure", "synstructure",
@ -6331,7 +6331,7 @@ dependencies = [
"bumpalo", "bumpalo",
"lazy_static", "lazy_static",
"log", "log",
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
"wasm-bindgen-shared", "wasm-bindgen-shared",
@ -6353,7 +6353,7 @@ version = "0.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eb197bd3a47553334907ffd2f16507b4f4f01bbec3ac921a7719e0decdfe72a" checksum = "8eb197bd3a47553334907ffd2f16507b4f4f01bbec3ac921a7719e0decdfe72a"
dependencies = [ dependencies = [
"proc-macro2 1.0.1", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
"syn", "syn",
"wasm-bindgen-backend", "wasm-bindgen-backend",

6
components/derive_common/cg.rs
View file

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

8
python/servo/command_base.py
View file

@ -986,7 +986,13 @@ install them, let us know by filing a bug!")
installed = check_output( installed = check_output(
["rustup", "component", "list", "--installed", "--toolchain", toolchain] ["rustup", "component", "list", "--installed", "--toolchain", toolchain]
) )
for component in set(rustup_components or []) | {"rustc-dev"}: required_components = {
# For components/script_plugins, https://github.com/rust-lang/rust/pull/67469
"rustc-dev",
# https://github.com/rust-lang/rust/issues/72594#issuecomment-633779564
"llvm-tools-preview",
}
for component in set(rustup_components or []) | required_components:
if component.encode("utf-8") not in installed: if component.encode("utf-8") not in installed:
check_call(["rustup", "component", "add", "--toolchain", toolchain, component]) check_call(["rustup", "component", "add", "--toolchain", toolchain, component])