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

Fix some warnings in gfx.

Browse source
This commit is contained in:
Simon Sapin 2015-03-18 22:08:00 +01:00
parent 2f6951af0b
commit 5ffd71cd5e
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/display_list/mod.rs
View file

@ -14,7 +14,7 @@
//! They are therefore not exactly analogous to constructs like Skia pictures, which consist of //! They are therefore not exactly analogous to constructs like Skia pictures, which consist of
//! low-level drawing primitives. //! low-level drawing primitives.
#![deny(unsafe_blocks)] #![deny(unsafe_code)]
use display_list::optimizer::DisplayListOptimizer; use display_list::optimizer::DisplayListOptimizer;
use paint_context::{PaintContext, ToAzureRect}; use paint_context::{PaintContext, ToAzureRect};

5
components/gfx/lib.rs
View file

@ -6,10 +6,9 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(collections)] #![feature(collections)]
#![feature(core)] #![feature(core)]
#![feature(hash)]
#![feature(int_uint)] #![feature(int_uint)]
#![cfg_attr(any(target_os="linux", target_os = "android"), feature(io))] #![cfg_attr(any(target_os="linux", target_os = "android"), feature(old_io))]
#![cfg_attr(any(target_os="linux", target_os = "android"), feature(path))] #![cfg_attr(any(target_os="linux", target_os = "android"), feature(old_path))]
#![feature(plugin)] #![feature(plugin)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]

2
components/gfx/paint_task.rs
View file

@ -439,7 +439,7 @@ impl WorkerThreadProxy {
font_cache_task, font_cache_task,
time_profiler_chan); time_profiler_chan);
worker_thread.main(); worker_thread.main();
}); }).unwrap();
WorkerThreadProxy { WorkerThreadProxy {
receiver: from_worker_receiver, receiver: from_worker_receiver,
sender: to_worker_sender, sender: to_worker_sender,

4
components/gfx/platform/freetype/font_list.rs
View file

@ -59,7 +59,7 @@ pub fn get_variations_for_family<F>(family_name: &str, mut callback: F)
let font_set_array_ptr = &mut font_set; let font_set_array_ptr = &mut font_set;
let pattern = FcPatternCreate(); let pattern = FcPatternCreate();
assert!(!pattern.is_null()); assert!(!pattern.is_null());
let family_name_c = CString::from_slice(family_name.as_bytes()); let family_name_c = CString::new(family_name).unwrap();
let family_name = family_name_c.as_ptr(); let family_name = family_name_c.as_ptr();
let ok = FcPatternAddString(pattern, FC_FAMILY.as_ptr() as *mut c_char, family_name as *mut FcChar8); let ok = FcPatternAddString(pattern, FC_FAMILY.as_ptr() as *mut c_char, family_name as *mut FcChar8);
assert!(ok != 0); assert!(ok != 0);
@ -102,7 +102,7 @@ pub fn get_variations_for_family<F>(family_name: &str, mut callback: F)
} }
pub fn get_system_default_family(generic_name: &str) -> Option<String> { pub fn get_system_default_family(generic_name: &str) -> Option<String> {
let generic_name_c = CString::from_slice(generic_name.as_bytes()); let generic_name_c = CString::new(generic_name).unwrap();
let generic_name_ptr = generic_name_c.as_ptr(); let generic_name_ptr = generic_name_c.as_ptr();
unsafe { unsafe {