Auto merge of #20703 - servo:rustup, r=nox

Upgrade to rustc 1.27.0-nightly (8a37c75a3 2018-05-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/20703)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-05-04 05:47:51 -04:00 committed by GitHub
commit 9296a5475b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 16 deletions

View file

@ -17,7 +17,7 @@ pub use platform::*;
mod platform {
extern crate jemalloc_sys as ffi;
use std::alloc::{GlobalAlloc, Layout, Opaque, System};
use std::alloc::{GlobalAlloc, Layout, Opaque};
use std::os::raw::{c_int, c_void};
/// Get the size of a heap block.
@ -94,11 +94,6 @@ mod platform {
let flags = layout_to_flags(layout.align(), new_size);
ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque
}
#[inline]
fn oom(&self) -> ! {
System.oom()
}
}
}

View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(proc_macro)]
#![feature(proc_macro, proc_macro_non_items)]
extern crate proc_macro;

View file

@ -2,9 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// For SIMD
#![cfg_attr(feature = "unstable", feature(cfg_target_feature))]
#![deny(unsafe_code)]
extern crate app_units;

View file

@ -4,6 +4,7 @@ version = "0.0.1"
authors = ["The Servo Project Developers"]
license = "MPL-2.0"
publish = false
autotests = false # Inhibit lookup for tests/*.rs without [[test]] sections
[lib]
name = "net"

View file

@ -143,14 +143,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
let def_id = cx.tcx.hir.local_def_id(id);
let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx);
for (arg, ty) in decl.inputs.iter().zip(sig.inputs().0.iter()) {
for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) {
if is_unrooted_ty(cx, ty, false) {
cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted")
}
}
if !in_new_function {
if is_unrooted_ty(cx, sig.output().0, false) {
if is_unrooted_ty(cx, sig.output().skip_binder(), false) {
cx.span_lint(UNROOTED_MUST_ROOT, decl.output.span(), "Type must be rooted")
}
}

View file

@ -25,7 +25,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
other.into_iter()
.map(|e| e.data)
.zip(path)
.all(|(nm, p)| &*nm.as_interned_str() == *p)
.all(|(nm, p)| nm.as_interned_str().with(|nm| nm == *p))
}
pub fn in_derive_expn(span: Span) -> bool {

View file

@ -191,7 +191,8 @@ fn compute_damage(old: &ComputedValues, new: &ComputedValues) -> ServoRestyleDam
// This should check every CSS property, as enumerated in the fields of
// http://doc.servo.org/style/properties/struct.ComputedValues.html
restyle_damage_rebuild_and_reflow!(
// This uses short-circuiting boolean OR for its side effects and ignores the result.
let _ = restyle_damage_rebuild_and_reflow!(
old,
new,
damage,