diff options
| author | Alex Vlasov <alex.m.vlasov@gmail.com> | 2021-06-20 16:09:42 +0200 |
|---|---|---|
| committer | Alex Vlasov <alex.m.vlasov@gmail.com> | 2021-06-20 16:09:42 +0200 |
| commit | aa53928ed7b763abd882f2a5efb8f98f53ccc6a9 (patch) | |
| tree | 30377d01a46cdaee160f02c9bac254e27f841c8e /library | |
| parent | 304441960e7058fe97f09ef00b20739b4dc56d11 (diff) | |
Squashed implementation of the pass
Diffstat (limited to 'library')
| -rw-r--r-- | library/core/src/slice/mod.rs | 1 | ||||
| -rw-r--r-- | library/std/src/thread/local/tests.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs index 0e5c5ee726e..018aba2e97f 100644 --- a/library/core/src/slice/mod.rs +++ b/library/core/src/slice/mod.rs @@ -96,6 +96,7 @@ impl<T> [T] { /// assert_eq!(a.len(), 3); /// ``` #[doc(alias = "length")] + #[cfg_attr(not(bootstrap), lang = "slice_len_fn")] #[stable(feature = "rust1", since = "1.0.0")] #[rustc_const_stable(feature = "const_slice_len", since = "1.39.0")] #[inline] diff --git a/library/std/src/thread/local/tests.rs b/library/std/src/thread/local/tests.rs index f33d6129619..1df1ca758c0 100644 --- a/library/std/src/thread/local/tests.rs +++ b/library/std/src/thread/local/tests.rs @@ -297,7 +297,7 @@ fn join_orders_after_tls_destructors() { .unwrap(); loop { - match SYNC_STATE.compare_exchange_weak( + match SYNC_STATE.compare_exchange( THREAD1_WAITING, MAIN_THREAD_RENDEZVOUS, Ordering::SeqCst, |
