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

Stylo: replace uses of mem::uninitialized with MaybeUninit

Browse source 
MozReview-Commit-ID: KGhYL6DJRaR
This commit is contained in:
Simon Sapin 2019-07-06 18:16:30 +02:00
parent 00b3fb49c4
commit 17ec774a49
9 changed files with 60 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/style/properties/properties.mako.rs
View file

@ -17,7 +17,7 @@ use servo_arc::{Arc, UniqueArc};
use std::borrow::Cow;
use std::{ops, ptr};
use std::fmt::{self, Write};
use std::mem::{self, ManuallyDrop};
use std::mem;
use cssparser::{Parser, RGBA, TokenSerializationType};
use cssparser::ParserInput;
@ -294,12 +294,12 @@ impl Clone for PropertyDeclaration {
}
unsafe {
let mut out = mem::uninitialized();
let mut out = mem::MaybeUninit::uninit();
ptr::write(
&mut out as *mut _ as *mut CopyVariants,
out.as_mut_ptr() as *mut CopyVariants,
*(self as *const _ as *const CopyVariants),
);
return out;
return out.assume_init();
}
}
@ -333,15 +333,15 @@ impl Clone for PropertyDeclaration {
% else:
${" |\n".join("{}(ref value)".format(v["name"]) for v in vs)} => {
unsafe {
let mut out = ManuallyDrop::new(mem::uninitialized());
let mut out = mem::MaybeUninit::uninit();
ptr::write(
&mut out as *mut _ as *mut PropertyDeclarationVariantRepr<${ty}>,
out.as_mut_ptr() as *mut PropertyDeclarationVariantRepr<${ty}>,
PropertyDeclarationVariantRepr {
tag: *(self as *const _ as *const u16),
value: value.clone(),
},
);
ManuallyDrop::into_inner(out)
out.assume_init()
}
}
% endif