Skip to content

Commit 848cfe2

Browse files
committed
Link test to compiler builtins and make unstable
This commit fixes a test which now needs to explicitly link to the `compiler_builtins` crate as well as makes the `compiler_builtins` crate unstable.
1 parent 2656202 commit 848cfe2

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

src/libcompiler_builtins/lib.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
#![cfg_attr(not(stage0), feature(compiler_builtins))]
1212
#![no_std]
1313
#![cfg_attr(not(stage0), compiler_builtins)]
14-
14+
#![unstable(feature = "compiler_builtins_lib",
15+
reason = "internal implementation detail of rustc right now",
16+
issue = "0")]
1517
#![crate_name = "compiler_builtins"]
1618
#![crate_type = "rlib"]
19+
#![feature(staged_api)]

src/libstd/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@
224224
#![feature(char_internals)]
225225
#![feature(collections)]
226226
#![feature(collections_bound)]
227+
#![feature(compiler_builtins_lib)]
227228
#![feature(const_fn)]
228229
#![feature(core_float)]
229230
#![feature(core_intrinsics)]

src/test/run-make/no-duplicate-libs/bar.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(lang_items, libc)]
11+
#![feature(lang_items, libc, compiler_builtins_lib)]
1212
#![crate_type = "dylib"]
1313
#![no_std]
1414

1515
extern crate libc;
16+
extern crate compiler_builtins;
1617

1718
#[no_mangle]
1819
pub extern fn bar() {}

src/test/run-make/no-duplicate-libs/foo.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(lang_items, libc)]
11+
#![feature(lang_items, libc, compiler_builtins_lib)]
1212
#![no_std]
1313
#![crate_type = "dylib"]
1414

1515
extern crate libc;
16+
extern crate compiler_builtins;
1617

1718
#[no_mangle]
1819
pub extern fn foo() {}

0 commit comments

Comments
 (0)