Made external_crates feature work again.

Also added test for it.

Fixes #21928
This commit is contained in:
Alexander Light 2015-02-05 10:51:17 -05:00
parent ac134f7ca4
commit 8fded29586
3 changed files with 44 additions and 1 deletions

View File

@ -73,7 +73,9 @@
#![feature(unboxed_closures)]
#![feature(core)]
#![feature(hash)]
#![feature(libc)]
#![cfg_attr(all(not(feature = "external_funcs"), not(feature = "external_crate")),
feature(libc))]
#[macro_use]
extern crate core;

View File

@ -0,0 +1,5 @@
-include ../tools.mk
all:
$(RUSTC) fakealloc.rs
$(RUSTC) ../../../liballoc/lib.rs --cfg feature=\"external_crate\" --extern external=$(TMPDIR)/$(shell $(RUSTC) --print file-names fakealloc.rs)

View File

@ -0,0 +1,36 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![crate_type = "rlib"]
#![no_std]
#![feature(core)]
extern crate core;
#[inline]
pub unsafe fn allocate(_size: usize, _align: usize) -> *mut u8 { 0 as *mut u8 }
#[inline]
pub unsafe fn deallocate(_ptr: *mut u8, _old_size: usize, _align: usize) { }
#[inline]
pub unsafe fn reallocate(_ptr: *mut u8, _old_size: usize, _size: usize, _align: usize) -> *mut u8 {
0 as *mut u8
}
#[inline]
pub unsafe fn reallocate_inplace(_ptr: *mut u8, old_size: usize, _size: usize,
_align: usize) -> usize { old_size }
#[inline]
pub fn usable_size(size: usize, _align: usize) -> usize { size }
#[inline]
pub fn stats_print() { }