Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.34.0-nightly (0ea22717a 2019-03-02)

Browse source
This commit is contained in:
Simon Sapin 2019-03-03 12:02:42 +01:00
parent 4d8d54fc00
commit 99b898753f
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/bindings/conversions.rs
View file

@ -71,7 +71,7 @@ pub trait IDLInterface {
/// A trait to mark an IDL interface as deriving from another one. /// A trait to mark an IDL interface as deriving from another one.
#[cfg_attr( #[cfg_attr(
feature = "unstable", feature = "unstable",
rustc_on_unimplemented = "The IDL interface `{Self}` is not derived from `{T}`." rustc_on_unimplemented(message = "The IDL interface `{Self}` is not derived from `{T}`.")
)] )]
pub trait DerivedFrom<T: Castable>: Castable {} pub trait DerivedFrom<T: Castable>: Castable {}

1
components/script/lib.rs
View file

@ -7,7 +7,6 @@
#![feature(const_fn)] #![feature(const_fn)]
#![feature(drain_filter)] #![feature(drain_filter)]
#![feature(plugin)] #![feature(plugin)]
#![feature(try_from)]
#![feature(type_alias_enum_variants)] #![feature(type_alias_enum_variants)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![allow(non_snake_case)] #![allow(non_snake_case)]

6
components/script_plugins/unrooted_must_root.rs
View file

@ -128,7 +128,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
}; };
if item.attrs.iter().all(|a| !a.check_name("must_root")) { if item.attrs.iter().all(|a| !a.check_name("must_root")) {
for ref field in def.fields() { for ref field in def.fields() {
let def_id = cx.tcx.hir().local_def_id(field.id); let def_id = cx.tcx.hir().local_def_id_from_hir_id(field.hir_id);
if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) { if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) {
cx.span_lint(UNROOTED_MUST_ROOT, field.span, cx.span_lint(UNROOTED_MUST_ROOT, field.span,
"Type must be rooted, use #[must_root] on the struct definition to propagate") "Type must be rooted, use #[must_root] on the struct definition to propagate")
@ -141,7 +141,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) { fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) {
let ref map = cx.tcx.hir(); let ref map = cx.tcx.hir();
if map if map
.expect_item(map.get_parent(var.node.data.id())) .expect_item_by_hir_id(map.get_parent_item(var.node.data.hir_id()))
.attrs .attrs
.iter() .iter()
.all(|a| !a.check_name("must_root")) .all(|a| !a.check_name("must_root"))
@ -149,7 +149,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
match var.node.data { match var.node.data {
hir::VariantData::Tuple(ref fields, ..) => { hir::VariantData::Tuple(ref fields, ..) => {
for ref field in fields { for ref field in fields {
let def_id = cx.tcx.hir().local_def_id(field.id); let def_id = cx.tcx.hir().local_def_id_from_hir_id(field.hir_id);
if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) { if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) {
cx.span_lint( cx.span_lint(
UNROOTED_MUST_ROOT, UNROOTED_MUST_ROOT,

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2019-02-25 nightly-2019-03-03