зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #18579 - Remove unused feature gates (from mbrubeck:features); r=KiChjang
CC #5286. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because no code changes Source-Repo: https://github.com/servo/servo Source-Revision: 29517d553e6c2fddc7e3cf0c0abef58c6d0f34aa --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : c2e8b88135a03d5d56b950e5ee25123e7403c31c
This commit is contained in:
Родитель
9a9951f4be
Коммит
c965d8f708
|
@ -7,7 +7,6 @@
|
|||
#![feature(box_syntax)]
|
||||
#![feature(cfg_target_feature)]
|
||||
#![feature(range_contains)]
|
||||
#![feature(unique)]
|
||||
|
||||
#![deny(unsafe_code)]
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@ impl Shaper {
|
|||
Shaper::float_to_fixed(pt_size) as c_int);
|
||||
|
||||
// configure static function callbacks.
|
||||
hb_font_set_funcs(hb_font, HB_FONT_FUNCS.as_ptr(), font as *mut Font as *mut c_void, None);
|
||||
hb_font_set_funcs(hb_font, HB_FONT_FUNCS.0, font as *mut Font as *mut c_void, None);
|
||||
|
||||
Shaper {
|
||||
hb_face: hb_face,
|
||||
|
@ -411,9 +411,13 @@ impl Shaper {
|
|||
}
|
||||
}
|
||||
|
||||
// Callbacks from Harfbuzz when font map and glyph advance lookup needed.
|
||||
/// Callbacks from Harfbuzz when font map and glyph advance lookup needed.
|
||||
struct FontFuncs(*mut hb_font_funcs_t);
|
||||
|
||||
unsafe impl Sync for FontFuncs {}
|
||||
|
||||
lazy_static! {
|
||||
static ref HB_FONT_FUNCS: ptr::Unique<hb_font_funcs_t> = unsafe {
|
||||
static ref HB_FONT_FUNCS: FontFuncs = unsafe {
|
||||
let hb_funcs = hb_font_funcs_create();
|
||||
hb_font_funcs_set_glyph_func(hb_funcs, Some(glyph_func), ptr::null_mut(), None);
|
||||
hb_font_funcs_set_glyph_h_advance_func(
|
||||
|
@ -421,7 +425,7 @@ lazy_static! {
|
|||
hb_font_funcs_set_glyph_h_kerning_func(
|
||||
hb_funcs, Some(glyph_h_kerning_func), ptr::null_mut(), None);
|
||||
|
||||
ptr::Unique::new_unchecked(hb_funcs)
|
||||
FontFuncs(hb_funcs)
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -14,9 +14,7 @@
|
|||
#![feature(on_unimplemented)]
|
||||
#![feature(plugin)]
|
||||
#![feature(proc_macro)]
|
||||
#![feature(stmt_expr_attributes)]
|
||||
#![feature(try_from)]
|
||||
#![feature(unboxed_closures)]
|
||||
#![feature(untagged_unions)]
|
||||
|
||||
#![deny(unsafe_code)]
|
||||
|
|
|
@ -15,7 +15,10 @@
|
|||
|
||||
|
||||
#![deny(unsafe_code)]
|
||||
#![feature(box_syntax, plugin, plugin_registrar, rustc_private)]
|
||||
#![feature(box_syntax)]
|
||||
#![feature(plugin)]
|
||||
#![feature(plugin_registrar)]
|
||||
#![feature(rustc_private)]
|
||||
|
||||
#[macro_use]
|
||||
extern crate rustc;
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
//!
|
||||
//! [glutin]: https://github.com/tomaka/glutin
|
||||
|
||||
#![feature(start, core_intrinsics)]
|
||||
#![feature(core_intrinsics)]
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
extern crate android_injected_glue;
|
||||
|
|
Загрузка…
Ссылка в новой задаче