From c50d9f36837bcbd9ac29f30e4983e0c0dd9b1fc9 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Fri, 4 Dec 2020 13:54:09 +0100 Subject: Remove unnecessary `Option` --- crates/proc_macro_api/src/process.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/crates/proc_macro_api/src/process.rs b/crates/proc_macro_api/src/process.rs index 907cb3db7..fca506905 100644 --- a/crates/proc_macro_api/src/process.rs +++ b/crates/proc_macro_api/src/process.rs @@ -19,7 +19,7 @@ use crate::{ #[derive(Debug, Default)] pub(crate) struct ProcMacroProcessSrv { - inner: Option>>, + inner: Weak>, } #[derive(Debug)] @@ -42,7 +42,7 @@ impl ProcMacroProcessSrv { }); let task_tx = Arc::new(task_tx); - let srv = ProcMacroProcessSrv { inner: Some(Arc::downgrade(&task_tx)) }; + let srv = ProcMacroProcessSrv { inner: Arc::downgrade(&task_tx) }; let thread = ProcMacroProcessThread { handle, sender: task_tx }; Ok((thread, srv)) @@ -79,13 +79,8 @@ impl ProcMacroProcessSrv { where R: TryFrom, { - let sender = match &self.inner { - None => return Err(tt::ExpansionError::Unknown("No sender is found.".to_string())), - Some(it) => it, - }; - let (result_tx, result_rx) = bounded(0); - let sender = match sender.upgrade() { + let sender = match self.inner.upgrade() { None => { return Err(tt::ExpansionError::Unknown("Proc macro process is closed.".into())) } -- cgit v1.2.3