Browse Source

Merge branch 'revert-7d7e3137' into 'master'

Revert "Added 'oom' lang-item so downstream crates don't complain about missing 'oom' symbol"

See merge request redox-os/ralloc!64
Tom Almeida 6 năm trước cách đây
mục cha
commit
6b7ea16aad
2 tập tin đã thay đổi với 1 bổ sung3 xóa
  1. 0 2
      src/fail.rs
  2. 1 1
      src/lib.rs

+ 0 - 2
src/fail.rs

@@ -30,8 +30,6 @@ tls! {
 ///
 /// The rule of thumb is that this should be called, if and only if unwinding (which allocates)
 /// will hit the same error.
-#[linkage = "weak"]
-#[lang = "oom"]
 pub fn oom() -> ! {
     // If TLS is enabled, we will use the thread-local OOM.
     #[cfg(feature = "tls")]

+ 1 - 1
src/lib.rs

@@ -15,7 +15,7 @@
 #![feature(
     allocator_api, const_fn, core_intrinsics, stmt_expr_attributes, optin_builtin_traits,
     type_ascription, thread_local, linkage, try_from, const_unsafe_cell_new, const_atomic_bool_new,
-    const_nonzero_new, const_atomic_ptr_new, lang_items
+    const_nonzero_new, const_atomic_ptr_new
 )]
 #![warn(missing_docs)]