diff options
| author | bors <bors@rust-lang.org> | 2020-04-23 00:28:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-23 00:28:05 +0000 |
| commit | fc145e19d05e8f2ee0aad77a0eba93292ebd3887 (patch) | |
| tree | 1644d58fa36743ff3897969697e3f7bc7fd783f4 /src/libstd | |
| parent | db9b05aeb52b77d1eb780ee005979b63d093c214 (diff) | |
| parent | bb13aab8e570b8b062b494f3cbbf569ed6830c68 (diff) | |
| download | rust-fc145e19d05e8f2ee0aad77a0eba93292ebd3887.tar.gz rust-fc145e19d05e8f2ee0aad77a0eba93292ebd3887.zip | |
Auto merge of #71445 - Dylan-DPC:rollup-31givp1, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71256 (Lint must_use on mem::replace) - #71350 (Error code explanation extra check) - #71369 (allow wasm32 compilation of librustc_data_structures/profiling.rs) - #71400 (proc_macro::is_available()) - #71440 (Implement `Copy` for `AllocErr`) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/thread/local.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 29e99c0afd2..094c468a677 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -301,7 +301,7 @@ mod lazy { // value (an aliasing violation). To avoid setting the "I'm running a // destructor" flag we just use `mem::replace` which should sequence the // operations a little differently and make this safe to call. - mem::replace(&mut *ptr, Some(value)); + let _ = mem::replace(&mut *ptr, Some(value)); // After storing `Some` we want to get a reference to the contents of // what we just stored. While we could use `unwrap` here and it should |