mirror of
https://github.com/nushell/nushell.git
synced 2025-06-19 08:26:57 +02:00
Remove dead overlay code
May not be up to date on how the scoping should be resolved so got to go
This commit is contained in:
parent
ea00d2b4d6
commit
0c652a4203
@ -554,34 +554,6 @@ impl<'a> StateWorkingSet<'a> {
|
|||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn contains_decl_partial_match(&self, name: &[u8]) -> bool {
|
|
||||||
let mut removed_overlays = vec![];
|
|
||||||
|
|
||||||
for scope_frame in self.delta.scope.iter().rev() {
|
|
||||||
for overlay_frame in scope_frame.active_overlays(&mut removed_overlays).rev() {
|
|
||||||
for decl in &overlay_frame.decls {
|
|
||||||
if decl.0.starts_with(name) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for overlay_frame in self
|
|
||||||
.permanent_state
|
|
||||||
.active_overlays(&removed_overlays)
|
|
||||||
.rev()
|
|
||||||
{
|
|
||||||
for decl in &overlay_frame.decls {
|
|
||||||
if decl.0.starts_with(name) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
false
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn next_var_id(&self) -> VarId {
|
pub fn next_var_id(&self) -> VarId {
|
||||||
let num_permanent_vars = self.permanent_state.num_vars();
|
let num_permanent_vars = self.permanent_state.num_vars();
|
||||||
VarId::new(num_permanent_vars + self.delta.vars.len())
|
VarId::new(num_permanent_vars + self.delta.vars.len())
|
||||||
@ -850,20 +822,6 @@ impl<'a> StateWorkingSet<'a> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn has_overlay(&self, name: &[u8]) -> bool {
|
|
||||||
for scope_frame in self.delta.scope.iter().rev() {
|
|
||||||
if scope_frame
|
|
||||||
.overlays
|
|
||||||
.iter()
|
|
||||||
.any(|(overlay_name, _)| name == overlay_name)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
self.permanent_state.has_overlay(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Find the overlay corresponding to `name`.
|
/// Find the overlay corresponding to `name`.
|
||||||
pub fn find_overlay(&self, name: &[u8]) -> Option<&OverlayFrame> {
|
pub fn find_overlay(&self, name: &[u8]) -> Option<&OverlayFrame> {
|
||||||
for scope_frame in self.delta.scope.iter().rev() {
|
for scope_frame in self.delta.scope.iter().rev() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user