diff options
| author | Christian Poveda <cpovedar@fnal.gov> | 2019-06-20 17:01:48 -0500 |
|---|---|---|
| committer | Christian Poveda <cpovedar@fnal.gov> | 2019-06-20 17:01:48 -0500 |
| commit | e152c38f65ae1aa69630b0b82e571e52b05e3302 (patch) | |
| tree | a717ab627647fe0e4a11057a58277db860a4c1b4 /src/libstd/sys/windows | |
| parent | 752a1a46685412202153c53ae320957cb48c751b (diff) | |
| parent | f693d339f175b3aa23a91c62632c5f0c86886059 (diff) | |
| download | rust-e152c38f65ae1aa69630b0b82e571e52b05e3302.tar.gz rust-e152c38f65ae1aa69630b0b82e571e52b05e3302.zip | |
Fix merge issues
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/fast_thread_local.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libstd/sys/windows/fast_thread_local.rs b/src/libstd/sys/windows/fast_thread_local.rs index 0ccc67e3fd5..31d0bd1e72e 100644 --- a/src/libstd/sys/windows/fast_thread_local.rs +++ b/src/libstd/sys/windows/fast_thread_local.rs @@ -2,7 +2,3 @@ #![cfg(target_thread_local)] pub use crate::sys_common::thread_local::register_dtor_fallback as register_dtor; - -pub fn requires_move_before_drop() -> bool { - false -} |