diff options
| author | Jeremy Soller <jackpot51@gmail.com> | 2016-12-20 12:41:33 -0700 |
|---|---|---|
| committer | Jeremy Soller <jackpot51@gmail.com> | 2016-12-20 12:41:33 -0700 |
| commit | 86f85c13994ab5bb17291140f8274b6529da95cf (patch) | |
| tree | dc07745ae7bd5c4cd5f99a5bf57b3a7cb349fc12 /src/libstd | |
| parent | 57bc1a982e20524bbaac892c04e537c8f714dce6 (diff) | |
| download | rust-86f85c13994ab5bb17291140f8274b6529da95cf.tar.gz rust-86f85c13994ab5bb17291140f8274b6529da95cf.zip | |
Move start functions into libstd/rt
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 5 | ||||
| -rw-r--r-- | src/libstd/rt.rs | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 6a1bb1268d7..3c9e66a469c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -423,11 +423,6 @@ pub use core_collections::vec; #[stable(feature = "rust1", since = "1.0.0")] pub use std_unicode::char; -// Reexport the start module on platforms that provide it -#[unstable(feature = "start_fn", issue="0")] -#[cfg(target_os = "redox")] -pub use sys::start::*; - pub mod f32; pub mod f64; diff --git a/src/libstd/rt.rs b/src/libstd/rt.rs index 78d5aa597ba..abaa6358645 100644 --- a/src/libstd/rt.rs +++ b/src/libstd/rt.rs @@ -22,11 +22,14 @@ issue = "0")] #![doc(hidden)] - - // Reexport some of our utilities which are expected by other crates. pub use panicking::{begin_panic, begin_panic_fmt, update_panic_count}; +// Reexport the start module on platforms that provide it +#[unstable(feature = "start_fn", issue="0")] +#[cfg(target_os = "redox")] +pub use sys::start::*; + #[cfg(not(test))] #[lang = "start"] fn lang_start(main: *const u8, argc: isize, argv: *const *const u8) -> isize { |
