Skip to content

Commit

Permalink
Register new snapshots
Browse files Browse the repository at this point in the history
These new snapshots contain the knowledge of how to build the new triples of
32-bit MSVC and 32-bit FreeBSD, both of which should soon start having
nightlies/auto builders!

This does not currently register bitrig/freebsd snapshots but I believe those
will be retroactively added in the near future.
  • Loading branch information
alexcrichton committed Jul 20, 2015
1 parent 39d4faf commit 7cb157e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 31 deletions.
17 changes: 0 additions & 17 deletions src/liballoc/lib.rs
Expand Up @@ -135,20 +135,3 @@ pub fn oom() -> ! {
// allocate.
unsafe { core::intrinsics::abort() }
}

// FIXME(#14344): When linking liballoc with libstd, this library will be linked
// as an rlib (it only exists as an rlib). It turns out that an
// optimized standard library doesn't actually use *any* symbols
// from this library. Everything is inlined and optimized away.
// This means that linkers will actually omit the object for this
// file, even though it may be needed in the future.
//
// To get around this for now, we define a dummy symbol which
// will never get inlined so the stdlib can call it. The stdlib's
// reference to this symbol will cause this library's object file
// to get linked in to libstd successfully (the linker won't
// optimize it out).
#[doc(hidden)]
#[unstable(feature = "issue_14344_fixme")]
#[cfg(stage0)]
pub fn fixme_14344_be_sure_to_link_to_collections() {}
7 changes: 0 additions & 7 deletions src/libcollections/lib.rs
Expand Up @@ -133,13 +133,6 @@ pub mod btree_set {
pub use btree::set::*;
}


// FIXME(#14344) this shouldn't be necessary
#[doc(hidden)]
#[unstable(feature = "issue_14344_fixme")]
#[cfg(stage0)]
pub fn fixme_14344_be_sure_to_link_to_collections() {}

#[cfg(not(test))]
mod std {
pub use core::ops; // RangeFull
Expand Down
3 changes: 0 additions & 3 deletions src/libcollections/string.rs
Expand Up @@ -979,23 +979,20 @@ impl ops::Index<ops::RangeFull> for String {
}
}

#[cfg(not(stage0))]
#[stable(feature = "derefmut_for_string", since = "1.2.0")]
impl ops::IndexMut<ops::Range<usize>> for String {
#[inline]
fn index_mut(&mut self, index: ops::Range<usize>) -> &mut str {
&mut self[..][index]
}
}
#[cfg(not(stage0))]
#[stable(feature = "derefmut_for_string", since = "1.2.0")]
impl ops::IndexMut<ops::RangeTo<usize>> for String {
#[inline]
fn index_mut(&mut self, index: ops::RangeTo<usize>) -> &mut str {
&mut self[..][index]
}
}
#[cfg(not(stage0))]
#[stable(feature = "derefmut_for_string", since = "1.2.0")]
impl ops::IndexMut<ops::RangeFrom<usize>> for String {
#[inline]
Expand Down
4 changes: 0 additions & 4 deletions src/liblibc/lib.rs
Expand Up @@ -6535,8 +6535,4 @@ pub mod funcs {
}
}

#[doc(hidden)]
#[cfg(stage0)]
pub fn issue_14344_workaround() {} // FIXME #14344 force linkage to happen correctly

#[test] fn work_on_windows() { } // FIXME #10872 needed for a happy windows
8 changes: 8 additions & 0 deletions src/snapshots.txt
@@ -1,3 +1,11 @@
S 2015-07-17 d4432b3
linux-i386 93f6216a35d3bed3cedf244c9aff4cd716336bd9
linux-x86_64 d8f4967fc71a153c925faecf95a7feadf7e463a4
macos-i386 29852c4d4b5a851f16d627856a279cae5bf9bd01
macos-x86_64 1a20259899321062a0325edb1d22990f05d18708
winnt-i386 df50210f41db9a6f2968be5773b8e3bae32bb823
winnt-x86_64 d7774b724988485652781a804bdf8e05d28ead48

S 2015-05-24 ba0e1cd
bitrig-x86_64 2a710e16e3e3ef3760df1f724d66b3af34c1ef3f
freebsd-x86_64 370db40613f5c08563ed7e38357826dd42d4e0f8
Expand Down

0 comments on commit 7cb157e

Please sign in to comment.