mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Upgrade to rustc 1.43.0-nightly (5d04ce67f 2020-02-13)
This commit is contained in:
parent
db4f27f361
commit
708d3737df
9 changed files with 53 additions and 46 deletions
|
@ -135,7 +135,7 @@ impl FontInfo {
|
|||
let strings = table.strings().unwrap();
|
||||
let family = strings[family_index].clone();
|
||||
let face = strings[face_index].clone();
|
||||
((family, face))
|
||||
(family, face)
|
||||
} else {
|
||||
return Err(());
|
||||
}
|
||||
|
@ -145,7 +145,7 @@ impl FontInfo {
|
|||
let strings = table.strings().unwrap();
|
||||
let family = strings[family_index].clone();
|
||||
let face = strings[face_index].clone();
|
||||
((family, face))
|
||||
(family, face)
|
||||
} else {
|
||||
return Err(());
|
||||
}
|
||||
|
|
|
@ -944,8 +944,8 @@ impl Fragment {
|
|||
QuantitiesIncludedInIntrinsicInlineSizes::INTRINSIC_INLINE_SIZE_INCLUDES_MARGINS,
|
||||
) {
|
||||
let margin = style.logical_margin();
|
||||
(MaybeAuto::from_style(margin.inline_start, Au(0)).specified_or_zero() +
|
||||
MaybeAuto::from_style(margin.inline_end, Au(0)).specified_or_zero())
|
||||
MaybeAuto::from_style(margin.inline_start, Au(0)).specified_or_zero() +
|
||||
MaybeAuto::from_style(margin.inline_end, Au(0)).specified_or_zero()
|
||||
} else {
|
||||
Au(0)
|
||||
};
|
||||
|
@ -957,7 +957,7 @@ impl Fragment {
|
|||
QuantitiesIncludedInIntrinsicInlineSizes::INTRINSIC_INLINE_SIZE_INCLUDES_PADDING,
|
||||
) {
|
||||
let padding = style.logical_padding();
|
||||
(padding.inline_start.to_used_value(Au(0)) + padding.inline_end.to_used_value(Au(0)))
|
||||
padding.inline_start.to_used_value(Au(0)) + padding.inline_end.to_used_value(Au(0))
|
||||
} else {
|
||||
Au(0)
|
||||
};
|
||||
|
|
|
@ -2834,7 +2834,7 @@ impl ResourceTimingListener for HTMLMediaElementFetchListener {
|
|||
}
|
||||
|
||||
fn resource_timing_global(&self) -> DomRoot<GlobalScope> {
|
||||
(document_from_node(&*self.elem.root()).global())
|
||||
document_from_node(&*self.elem.root()).global()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -309,7 +309,7 @@ impl ResourceTimingListener for ClassicContext {
|
|||
}
|
||||
|
||||
fn resource_timing_global(&self) -> DomRoot<GlobalScope> {
|
||||
(document_from_node(&*self.elem.root()).global())
|
||||
document_from_node(&*self.elem.root()).global()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -202,12 +202,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
|
|||
for ref field in def.fields() {
|
||||
let def_id = cx.tcx.hir().local_def_id(field.hir_id);
|
||||
if is_unrooted_ty(&self.symbols, cx, cx.tcx.type_of(def_id), false) {
|
||||
cx.span_lint(
|
||||
UNROOTED_MUST_ROOT,
|
||||
field.span,
|
||||
cx.lint(UNROOTED_MUST_ROOT, |lint| {
|
||||
lint.build(
|
||||
"Type must be rooted, use #[unrooted_must_root_lint::must_root] \
|
||||
on the struct definition to propagate",
|
||||
)
|
||||
.set_span(field.span)
|
||||
.emit()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -224,12 +226,15 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
|
|||
for field in fields {
|
||||
let def_id = cx.tcx.hir().local_def_id(field.hir_id);
|
||||
if is_unrooted_ty(&self.symbols, cx, cx.tcx.type_of(def_id), false) {
|
||||
cx.span_lint(
|
||||
UNROOTED_MUST_ROOT,
|
||||
field.ty.span,
|
||||
"Type must be rooted, use #[unrooted_must_root_lint::must_root] on \
|
||||
the enum definition to propagate",
|
||||
cx.lint(UNROOTED_MUST_ROOT, |lint| {
|
||||
lint.build(
|
||||
"Type must be rooted, \
|
||||
use #[unrooted_must_root_lint::must_root] \
|
||||
on the enum definition to propagate",
|
||||
)
|
||||
.set_span(field.ty.span)
|
||||
.emit()
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -260,17 +265,19 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
|
|||
|
||||
for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) {
|
||||
if is_unrooted_ty(&self.symbols, cx, ty, false) {
|
||||
cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted")
|
||||
cx.lint(UNROOTED_MUST_ROOT, |lint| {
|
||||
lint.build("Type must be rooted").set_span(arg.span).emit()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if !in_new_function {
|
||||
if is_unrooted_ty(&self.symbols, cx, sig.output().skip_binder(), false) {
|
||||
cx.span_lint(
|
||||
UNROOTED_MUST_ROOT,
|
||||
decl.output.span(),
|
||||
"Type must be rooted",
|
||||
)
|
||||
cx.lint(UNROOTED_MUST_ROOT, |lint| {
|
||||
lint.build("Type must be rooted")
|
||||
.set_span(decl.output.span())
|
||||
.emit()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -299,11 +306,11 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
|
|||
let require_rooted = |cx: &LateContext, in_new_function: bool, subexpr: &hir::Expr| {
|
||||
let ty = cx.tables.expr_ty(&subexpr);
|
||||
if is_unrooted_ty(&self.symbols, cx, ty, in_new_function) {
|
||||
cx.span_lint(
|
||||
UNROOTED_MUST_ROOT,
|
||||
subexpr.span,
|
||||
&format!("Expression of type {:?} must be rooted", ty),
|
||||
)
|
||||
cx.lint(UNROOTED_MUST_ROOT, |lint| {
|
||||
lint.build(&format!("Expression of type {:?} must be rooted", ty))
|
||||
.set_span(subexpr.span)
|
||||
.emit()
|
||||
})
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -341,11 +348,11 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
|
|||
hir::PatKind::Binding(hir::BindingAnnotation::Mutable, ..) => {
|
||||
let ty = cx.tables.pat_ty(pat);
|
||||
if is_unrooted_ty(&self.symbols, cx, ty, self.in_new_function) {
|
||||
cx.span_lint(
|
||||
UNROOTED_MUST_ROOT,
|
||||
pat.span,
|
||||
&format!("Expression of type {:?} must be rooted", ty),
|
||||
)
|
||||
cx.lint(UNROOTED_MUST_ROOT, |lint| {
|
||||
lint.build(&format!("Expression of type {:?} must be rooted", ty))
|
||||
.set_span(pat.span)
|
||||
.emit()
|
||||
})
|
||||
}
|
||||
},
|
||||
_ => {},
|
||||
|
@ -386,11 +393,10 @@ fn match_def_path(cx: &LateContext, def_id: DefId, path: &[Symbol]) -> bool {
|
|||
}
|
||||
|
||||
fn in_derive_expn(span: Span) -> bool {
|
||||
if let ExpnKind::Macro(MacroKind::Attr, n) = span.ctxt().outer_expn_data().kind {
|
||||
n.as_str().contains("derive")
|
||||
} else {
|
||||
false
|
||||
}
|
||||
matches!(
|
||||
span.ctxt().outer_expn_data().kind,
|
||||
ExpnKind::Macro(MacroKind::Derive, _)
|
||||
)
|
||||
}
|
||||
|
||||
macro_rules! symbols {
|
||||
|
|
|
@ -388,7 +388,8 @@ macro_rules! sheet_set_methods {
|
|||
guard: &SharedRwLockReadGuard,
|
||||
) {
|
||||
if let Some(device) = device {
|
||||
self.invalidations.collect_invalidations_for(device, sheet, guard);
|
||||
self.invalidations
|
||||
.collect_invalidations_for(device, sheet, guard);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -435,7 +436,7 @@ macro_rules! sheet_set_methods {
|
|||
let collection = self.collection_for(&sheet, guard);
|
||||
collection.remove(&sheet)
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
impl<S> DocumentStylesheetSet<S>
|
||||
|
|
|
@ -80,7 +80,7 @@ macro_rules! computed_length_percentage_or_auto {
|
|||
generics::GenericLengthPercentageOrAuto::Auto => None,
|
||||
generics::GenericLengthPercentageOrAuto::LengthPercentage(ref lp) => {
|
||||
Some(lp.to_used_value(percentage_basis))
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -93,7 +93,7 @@ macro_rules! computed_length_percentage_or_auto {
|
|||
Auto => false,
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/// A computed type for `<length-percentage> | auto`.
|
||||
|
|
|
@ -61,7 +61,7 @@ macro_rules! system_font_methods {
|
|||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
const DEFAULT_SCRIPT_MIN_SIZE_PT: u32 = 8;
|
||||
|
|
|
@ -1 +1 @@
|
|||
nightly-2020-01-16
|
||||
nightly-2020-02-14
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue