mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
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:
commit
9296a5475b
9 changed files with 11 additions and 16 deletions
|
@ -17,7 +17,7 @@ pub use platform::*;
|
||||||
mod platform {
|
mod platform {
|
||||||
extern crate jemalloc_sys as ffi;
|
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};
|
use std::os::raw::{c_int, c_void};
|
||||||
|
|
||||||
/// Get the size of a heap block.
|
/// Get the size of a heap block.
|
||||||
|
@ -94,11 +94,6 @@ mod platform {
|
||||||
let flags = layout_to_flags(layout.align(), new_size);
|
let flags = layout_to_flags(layout.align(), new_size);
|
||||||
ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque
|
ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
|
||||||
fn oom(&self) -> ! {
|
|
||||||
System.oom()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* 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/. */
|
* 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;
|
extern crate proc_macro;
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,6 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* 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/. */
|
* 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)]
|
#![deny(unsafe_code)]
|
||||||
|
|
||||||
extern crate app_units;
|
extern crate app_units;
|
||||||
|
|
|
@ -4,6 +4,7 @@ version = "0.0.1"
|
||||||
authors = ["The Servo Project Developers"]
|
authors = ["The Servo Project Developers"]
|
||||||
license = "MPL-2.0"
|
license = "MPL-2.0"
|
||||||
publish = false
|
publish = false
|
||||||
|
autotests = false # Inhibit lookup for tests/*.rs without [[test]] sections
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "net"
|
name = "net"
|
||||||
|
|
|
@ -143,14 +143,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
|
||||||
let def_id = cx.tcx.hir.local_def_id(id);
|
let def_id = cx.tcx.hir.local_def_id(id);
|
||||||
let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx);
|
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) {
|
if is_unrooted_ty(cx, ty, false) {
|
||||||
cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted")
|
cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !in_new_function {
|
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")
|
cx.span_lint(UNROOTED_MUST_ROOT, decl.output.span(), "Type must be rooted")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
|
||||||
other.into_iter()
|
other.into_iter()
|
||||||
.map(|e| e.data)
|
.map(|e| e.data)
|
||||||
.zip(path)
|
.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 {
|
pub fn in_derive_expn(span: Span) -> bool {
|
||||||
|
|
|
@ -191,7 +191,8 @@ fn compute_damage(old: &ComputedValues, new: &ComputedValues) -> ServoRestyleDam
|
||||||
// This should check every CSS property, as enumerated in the fields of
|
// This should check every CSS property, as enumerated in the fields of
|
||||||
// http://doc.servo.org/style/properties/struct.ComputedValues.html
|
// 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,
|
old,
|
||||||
new,
|
new,
|
||||||
damage,
|
damage,
|
||||||
|
|
|
@ -398,7 +398,8 @@ def check_toml(file_name, lines):
|
||||||
for idx, line in enumerate(lines):
|
for idx, line in enumerate(lines):
|
||||||
if idx == 0 and "[workspace]" in line:
|
if idx == 0 and "[workspace]" in line:
|
||||||
raise StopIteration
|
raise StopIteration
|
||||||
if line.find("*") != -1:
|
line_without_comment, _, _ = line.partition("#")
|
||||||
|
if line_without_comment.find("*") != -1:
|
||||||
yield (idx + 1, "found asterisk instead of minimum version number")
|
yield (idx + 1, "found asterisk instead of minimum version number")
|
||||||
for license_line in licenses_toml:
|
for license_line in licenses_toml:
|
||||||
ok_licensed |= (license_line in line)
|
ok_licensed |= (license_line in line)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
nightly-2018-04-15
|
nightly-2018-05-03
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue