diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-24 14:50:46 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-24 14:50:46 -0700 |
| commit | a1d2e62c1f94930aaab2f9d56b3ee4f34f95369a (patch) | |
| tree | 3ed0a12ba754e76dc1af00f6a22e34a9cfd1bd88 /src/libstd/thread | |
| parent | 6da0b9dedbc975c3d9ae973216745de9dab535d2 (diff) | |
| parent | 7e3ee02006ec53ff176fc3490ba01eb2a9c823b8 (diff) | |
| download | rust-a1d2e62c1f94930aaab2f9d56b3ee4f34f95369a.tar.gz rust-a1d2e62c1f94930aaab2f9d56b3ee4f34f95369a.zip | |
rollup merge of #23630: nrc/coerce-tidy
See notes on the first commit Closes #18601 r? @nikomatsakis cc @eddyb
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 1bf1b09681c..a2b824bb016 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -176,6 +176,7 @@ macro_rules! __thread_local_inner { } }; + #[allow(trivial_casts)] #[cfg(any(not(any(target_os = "macos", target_os = "linux")), target_arch = "aarch64"))] const _INIT: ::std::thread::__local::__impl::KeyInner<$t> = { ::std::thread::__local::__impl::KeyInner { |