Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary Option

Browse source
This commit is contained in:
Jonas Schievink 2020-12-04 13:54:09 +01:00
parent b988c6f84e
commit c50d9f3683
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/proc_macro_api/src/process.rs
View file

@ -19,7 +19,7 @@ use crate::{
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub(crate) struct ProcMacroProcessSrv { pub(crate) struct ProcMacroProcessSrv {
inner: Option<Weak<Sender<Task>>>, inner: Weak<Sender<Task>>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -42,7 +42,7 @@ impl ProcMacroProcessSrv {
}); });
let task_tx = Arc::new(task_tx); 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 }; let thread = ProcMacroProcessThread { handle, sender: task_tx };
Ok((thread, srv)) Ok((thread, srv))
@ -79,13 +79,8 @@ impl ProcMacroProcessSrv {
where where
R: TryFrom<Response, Error = &'static str>, R: TryFrom<Response, Error = &'static str>,
{ {
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 (result_tx, result_rx) = bounded(0);
let sender = match sender.upgrade() { let sender = match self.inner.upgrade() {
None => { None => {
return Err(tt::ExpansionError::Unknown("Proc macro process is closed.".into())) return Err(tt::ExpansionError::Unknown("Proc macro process is closed.".into()))
} }