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

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

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

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22963)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-03-03 14:49:25 -05:00 • committed by GitHub
commit d3ad9d6ffb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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.
#[cfg_attr(
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 {}

1
components/script/lib.rs
View file

@ -7,7 +7,6 @@
#![feature(const_fn)]
#![feature(drain_filter)]
#![feature(plugin)]
#![feature(try_from)]
#![feature(type_alias_enum_variants)]
#![deny(unsafe_code)]
#![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")) {
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) {
cx.span_lint(UNROOTED_MUST_ROOT, field.span,
"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) {
let ref map = cx.tcx.hir();
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
.iter()
.all(|a| !a.check_name("must_root"))
@ -149,7 +149,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
match var.node.data {
hir::VariantData::Tuple(ref 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) {
cx.span_lint(
UNROOTED_MUST_ROOT,