h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-30 03:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Start removing calls to Parser::shared()

Browse Source 
Parser::shared() gets an Rc to a Parser, but we can do without it.
Let's aim to get rid of the cyclic ref.
This commit is contained in:
ridiculousfish
2024-05-26 14:34:20 -07:00
committed by Peter Ammon
parent 245ee466cb
commit 832ed31687
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/complete.rs
View File

@@ -1868,7 +1868,7 @@ fn getpwent_name() -> Option<WString> {
fn apply_var_assignments<'a>(
&mut self,
var_assignments: impl IntoIterator<Item = &'a wstr>,
) -> Option<ScopeGuard<(), impl FnOnce(&mut ())>> {
) -> Option<ScopeGuard<(), impl FnOnce(&mut ()) + 'ctx>> {
if !self.ctx.has_parser() {
return None;
}
@@ -1923,8 +1923,8 @@ fn apply_var_assignments<'a>(
}
}
let parser_ref = self.ctx.parser().shared();
Some(ScopeGuard::new((), move |_| parser_ref.pop_block(block)))
let parser = self.ctx.parser();
Some(ScopeGuard::new((), move |_| parser.pop_block(block)))
}
/// Complete a command by invoking user-specified completions.