@@ -102,7 +102,7 @@ pub struct Document {
102102 language_server: Option<Arc<helix_lsp::Client>>,
103103}
104104
105−use std::fmt;
105+use std::{fmt, mem};
106106impl fmt::Debug for Document {
107107 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
108108 f.debug_struct("Document")
@@ -301,20 +301,13 @@ pub async fn to_writer<'a, W: tokio::io::AsyncWriteExt + Unpin + ?Sized>(
301301 Ok(())
302302}
303303
304−/// Like std::mem::replace() except it allows the replacement value to be mapped from the
305−/// original value.
306−fn take_with<T, F>(mut_ref: &mut T, closure: F)
304+fn take_with<T, F>(mut_ref: &mut T, f: F)
307305where
306+ T: Default,
308307 F: FnOnce(T) -> T,
309308{
310− use std::{panic, ptr};
311−
312− unsafe {
313− let old_t = ptr::read(mut_ref);
314− let new_t = panic::catch_unwind(panic::AssertUnwindSafe(|| closure(old_t)))
315− .unwrap_or_else(|_| ::std::process::abort());
316− ptr::write(mut_ref, new_t);
317− }
309+ let t = mem::take(mut_ref);
310+ let _ = mem::replace(mut_ref, f(t));
318311}
319312
320313use helix_lsp::lsp;