diff options
| author | bors <bors@rust-lang.org> | 2019-12-12 02:11:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-12 02:11:31 +0000 |
| commit | f284f8b4be3a899bf2ecc03e2a1589f486b62a9f (patch) | |
| tree | f384ae1a43bfcacfdce90d2723d50fe09bd4ca96 /src/libstd | |
| parent | de0abf7599023b71dd72b44f0165e86c040ee7ea (diff) | |
| parent | 685d4cc7463afe2674dac4ac4298c93157965c2a (diff) | |
| download | rust-f284f8b4be3a899bf2ecc03e2a1589f486b62a9f.tar.gz rust-f284f8b4be3a899bf2ecc03e2a1589f486b62a9f.zip | |
Auto merge of #67246 - JohnTitor:rollup-nfa7skn, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #62514 (Clarify `Box<T>` representation and its use in FFI) - #66983 (Fix `unused_parens` triggers on macro by example code) - #67215 (Fix `-Z print-type-sizes`'s handling of zero-sized fields.) - #67230 (Remove irelevant comment on `register_dtor`) - #67236 (resolve: Always resolve visibilities on impl items) - #67237 (Some small readability improvements) - #67238 (Small std::borrow::Cow improvements) - #67239 (Make TinyList::remove iterate instead of recurse) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/fast_thread_local.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/fast_thread_local.rs b/src/libstd/sys/unix/fast_thread_local.rs index dfb9307daea..0861432f8a9 100644 --- a/src/libstd/sys/unix/fast_thread_local.rs +++ b/src/libstd/sys/unix/fast_thread_local.rs @@ -8,8 +8,6 @@ // Note, however, that we run on lots older linuxes, as well as cross // compiling from a newer linux to an older linux, so we also have a // fallback implementation to use as well. -// -// Due to rust-lang/rust#18804, make sure this is not generic! #[cfg(any( target_os = "linux", target_os = "fuchsia", |