Skip to content

Commit 66d44b0

Browse files
authored
Merge pull request #264 from alexcrichton/dep-of-std
Prepare for publication to crates.io
2 parents 4890819 + 02bcce8 commit 66d44b0

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

Cargo.toml

+14
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ version = "0.1.0"
66
[lib]
77
test = false
88

9+
[dependencies]
10+
# For more information on this dependency see rust-lang/rust's
11+
# `src/tools/rustc-std-workspace` folder
12+
core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core' }
13+
914
[build-dependencies]
1015
cc = { optional = true, version = "1.0" }
1116

@@ -32,9 +37,18 @@ mangled-names = []
3237
# Don't generate lang items for i128 intrisnics and such
3338
no-lang-items = []
3439

40+
# Only used in the compiler's build system
41+
rustc-dep-of-std = ['c', 'compiler-builtins', 'core']
42+
3543
[[example]]
3644
name = "intrinsics"
3745
required-features = ["c", "compiler-builtins"]
3846

3947
[workspace]
4048
members = ["testcrate"]
49+
50+
[profile.release]
51+
panic = 'abort'
52+
53+
[profile.dev]
54+
panic = 'abort'

ci/run.sh

+1-12
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,7 @@ case $1 in
6464
;;
6565
esac
6666

67-
case "$TRAVIS_OS_NAME" in
68-
osx)
69-
# NOTE OSx's nm doesn't accept the `--defined-only` or provide an equivalent.
70-
# Use GNU nm instead
71-
NM=gnm
72-
brew update
73-
brew install binutils
74-
;;
75-
*)
76-
NM=nm
77-
;;
78-
esac
67+
NM=nm
7968

8069
if [ -d /target ]; then
8170
path=/target/${1}/debug/deps/libcompiler_builtins-*.rlib

examples/intrinsics.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![feature(lang_items)]
1212
#![feature(start)]
1313
#![feature(allocator_api)]
14-
#![cfg_attr(windows, feature(panic_unwind))]
1514
#![no_std]
1615

1716
extern crate panic_handler;

0 commit comments

Comments
 (0)