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

Eliminate warning about unsafe references to extern static variables.

Browse source 
MozReview-Commit-ID: 7UJNBaEWnH7
This commit is contained in:
Bobby Holley 2016-10-10 19:22:29 -07:00 • committed by Manish Goregaokar
parent cad5a4e326
commit 8abc1bd275
3 changed files with 4936 additions and 2466 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/style/binding_tools/regen_atoms.py
View file

@ -109,8 +109,8 @@ ATOM_TEMPLATE = (" #[link_name = \"{link_name}\"]\n"
" pub static {name}: *mut {type};")
UNSAFE_STATIC = ("#[inline(always)]\n"
"pub fn unsafe_atom_from_static(ptr: *mut nsIAtom) -> Atom {\n"
" unsafe { Atom::from_static(ptr) }\n"
"pub unsafe fn atom_from_static(ptr: *mut nsIAtom) -> Atom {\n"
" Atom::from_static(ptr)\n"
"}\n\n")
CFG_IF = '''
@ -131,9 +131,14 @@ cfg_if! {{
}}
'''
RULE_TEMPLATE = ('("{atom}") => '
'{{ $crate::string_cache::atom_macro::unsafe_atom_from_static'
'($crate::string_cache::atom_macro::{name} as *mut _) }};')
RULE_TEMPLATE = ('("{atom}") =>\n '
'{{ '
# FIXME(bholley): Uncomment this when rust 1.14 is released.
# See the comment in components/style/lib.rs.
# ' #[allow(unsafe_code)] #[allow(unused_unsafe)] '
'unsafe {{ $crate::string_cache::atom_macro::atom_from_static'
'($crate::string_cache::atom_macro::{name} as *mut _) }}'
' }};')
MACRO = '''
#[macro_export]

7378
components/style/gecko_string_cache/atom_macro.rs
View file

File diff suppressed because it is too large Load diff

9
components/style/lib.rs
View file

@ -32,7 +32,14 @@
#![cfg_attr(feature = "servo", plugin(heapsize_plugin))]
#![cfg_attr(feature = "servo", plugin(plugins))]
#![deny(unsafe_code)]
// FIXME(bholley): We need to blanket-allow unsafe code in order to make the
// gecko atom!() macro work. When Rust 1.14 is released [1], we can uncomment
// the commented-out attributes in regen_atoms.py and go back to denying unsafe
// code by default.
//
// [1] https://github.com/rust-lang/rust/issues/15701#issuecomment-251900615
//#![deny(unsafe_code)]
#![allow(unused_unsafe)]
#![recursion_limit = "500"] // For match_ignore_ascii_case in PropertyDeclaration::parse