Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.38.0-nightly (dddb7fca0 2019-07-30)

Browse source
This commit is contained in:
Simon Sapin 2019-07-31 13:34:01 +02:00
parent 87e7e3d429
commit c38c964f1b
38 changed files with 118 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -7301,9 +7301,9 @@ def process_arg(expr, arg):
if arg.variadic or arg.type.isSequence():
expr += ".r()"
elif arg.type.nullable() and arg.optional and not arg.defaultValue:
expr += ".as_ref().map(Option::deref)"
expr += ".as_ref().map(Option::as_deref)"
elif arg.type.nullable() or arg.optional and not arg.defaultValue:
expr += ".deref()"
expr += ".as_deref()"
else:
expr = "&" + expr
elif isinstance(arg.type, IDLPromiseType):

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

@ -332,7 +332,7 @@ unsafe impl<T: DomObject> JSTraceable for Dom<T> {
unsafe fn trace(&self, trc: *mut JSTracer) {
let trace_string;
let trace_info = if cfg!(debug_assertions) {
trace_string = format!("for {} on heap", ::std::intrinsics::type_name::<T>());
trace_string = format!("for {} on heap", ::std::any::type_name::<T>());
&trace_string[..]
} else {
"for DOM object on heap"