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

Auto merge of #17693 - emilio:revert-rustup, r=nox

Browse source 
Revert "Auto merge of #17633 - servo:rustup, r=nox"

This reverts commit 327e72aa14, reversing
changes made to eec51cdd57.

This closes #17642.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17693)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-12 19:04:21 -07:00 • committed by GitHub
commit 3e2f6dc870
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/gfx/lib.rs
View file

@ -3,9 +3,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// For SIMD
#![cfg_attr(any(target_os = "linux", target_os = "android"), feature(alloc, allocator_api))]
#![feature(box_syntax)]
#![feature(cfg_target_feature)]
#![cfg_attr(any(target_os = "linux", target_os = "android"), feature(heap_api))]
#![cfg_attr(any(target_os = "linux", target_os = "android"), feature(alloc))]
#![feature(box_syntax)]
#![feature(range_contains)]
#![feature(unique)]

15
components/gfx/platform/freetype/font_context.rs
View file

@ -2,8 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use alloc::allocator::{Alloc, Layout};
use alloc::heap::Heap;
use alloc::heap;
use freetype::freetype::FT_Add_Default_Modules;
use freetype::freetype::FT_Done_Library;
use freetype::freetype::FT_Library;
@ -27,8 +26,7 @@ const FT_ALIGNMENT: usize = 1;
extern fn ft_alloc(mem: FT_Memory, req_size: c_long) -> *mut c_void {
unsafe {
let layout = Layout::from_size_align(req_size as usize, FT_ALIGNMENT).unwrap();
let ptr = Heap.alloc(layout).unwrap() as *mut c_void;
let ptr = heap::allocate(req_size as usize, FT_ALIGNMENT) as *mut c_void;
let actual_size = heap_size_of(ptr as *const _);
let user = (*mem).user as *mut User;
@ -45,8 +43,7 @@ extern fn ft_free(mem: FT_Memory, ptr: *mut c_void) {
let user = (*mem).user as *mut User;
(*user).size -= actual_size;
let layout = Layout::from_size_align(actual_size, FT_ALIGNMENT).unwrap();
Heap.dealloc(ptr as *mut u8, layout);
heap::deallocate(ptr as *mut u8, actual_size, FT_ALIGNMENT);
}
}
@ -54,10 +51,8 @@ extern fn ft_realloc(mem: FT_Memory, _cur_size: c_long, new_req_size: c_long,
old_ptr: *mut c_void) -> *mut c_void {
unsafe {
let old_actual_size = heap_size_of(old_ptr as *const _);
let old_layout = Layout::from_size_align(old_actual_size, FT_ALIGNMENT).unwrap();
let new_layout = Layout::from_size_align(new_req_size as usize, FT_ALIGNMENT).unwrap();
let result = Heap.realloc(old_ptr as *mut u8, old_layout, new_layout);
let new_ptr = result.unwrap() as *mut c_void;
let new_ptr = heap::reallocate(old_ptr as *mut u8, old_actual_size,
new_req_size as usize, FT_ALIGNMENT) as *mut c_void;
let new_actual_size = heap_size_of(new_ptr as *const _);
let user = (*mem).user as *mut User;

2
rust-commit-hash
View file

@ -1 +1 @@
696412de7e4e119f8536686c643621115b90c775
3bfc18a9619a5151ff4f11618db9cd882996ba6f