diff options
| author | bors <bors@rust-lang.org> | 2013-10-17 00:21:20 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-17 00:21:20 -0700 |
| commit | 00adcf0bdd9376046859b7bc0d79097b621844c5 (patch) | |
| tree | 6cb9e2fea66aa804ca03764ca1e948825519ffbb /src/libstd | |
| parent | 88acb73ce5a98e707ce68f5c0579641de38b5955 (diff) | |
| parent | 88ab38cf060b794f3c4c3572cee7ca25354946d6 (diff) | |
| download | rust-00adcf0bdd9376046859b7bc0d79097b621844c5.tar.gz rust-00adcf0bdd9376046859b7bc0d79097b621844c5.zip | |
auto merge of #9863 : csainty/rust/issue-9755-once-fns-feature-directive, r=alexcrichton
Hello, First time rust contributor here, please let me know if I need to sort out the contribution agreement for this. I picked issue #9755 to dip my toe in the water, this pull request isn't quite complete though as I have not updated the documentation. The reason for this is that I haven't tracked down why this feature is gated so I don't feel I can write a justification of the same quality as the other features have been documented. If someone would like to explain or point me at a mail thread I am happy to update with this change. Hopefully I have understood the process of converting the old flag into a directive correctly. Also just to call out what I am sure if a known quirk when adding feature directives, you can't build this code unless you have a snapshot of the compiler which knows about the feature directive. Chicken and the egg. I split the change into two commits, the first should be able to build a snapshot that can compile the second.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/unstable/intrinsics.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index 7cda2b109d9..dee21762a30 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -331,7 +331,8 @@ extern "rust-intrinsic" { pub fn visit_tydesc(td: *TyDesc, tv: &mut TyVisitor); - pub fn frame_address(f: &once fn(*u8)); + #[cfg(not(stage0))] + pub fn frame_address(f: &fn(*u8)); /// Get the address of the `__morestack` stack growth function. pub fn morestack_addr() -> *(); |
