extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 16:33:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary boxing of Stack::recursion_count (#11238)

Browse Source
This commit is contained in:
Ian Manske 2023-12-06 08:48:56 +00:00 committed by GitHub
parent 858c93d2e5
commit 51bf8d9f6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-engine/src/eval.rs
View File

@ -611,14 +611,14 @@ pub fn eval_block(
// picked 50 arbitrarily, should work on all architectures // picked 50 arbitrarily, should work on all architectures
const RECURSION_LIMIT: u64 = 50; const RECURSION_LIMIT: u64 = 50;
if recursive { if recursive {
if *stack.recursion_count >= RECURSION_LIMIT { if stack.recursion_count >= RECURSION_LIMIT {
stack.recursion_count = Box::new(0); stack.recursion_count = 0;
return Err(ShellError::RecursionLimitReached { return Err(ShellError::RecursionLimitReached {
recursion_limit: RECURSION_LIMIT, recursion_limit: RECURSION_LIMIT,
span: block.span, span: block.span,
}); });
} }
*stack.recursion_count += 1; stack.recursion_count += 1;
} }
} }

8
crates/nu-protocol/src/engine/stack.rs
View File

@ -35,7 +35,7 @@ pub struct Stack {
pub env_hidden: HashMap<String, HashSet<String>>, pub env_hidden: HashMap<String, HashSet<String>>,
/// List of active overlays /// List of active overlays
pub active_overlays: Vec<String>, pub active_overlays: Vec<String>,
pub recursion_count: Box<u64>, pub recursion_count: u64,
} }
impl Stack { impl Stack {
@ -45,7 +45,7 @@ impl Stack {
env_vars: vec![], env_vars: vec![],
env_hidden: HashMap::new(), env_hidden: HashMap::new(),
active_overlays: vec![DEFAULT_OVERLAY_NAME.to_string()], active_overlays: vec![DEFAULT_OVERLAY_NAME.to_string()],
recursion_count: Box::new(0), recursion_count: 0,
} }
} }
@ -159,7 +159,7 @@ impl Stack {
env_vars, env_vars,
env_hidden: self.env_hidden.clone(), env_hidden: self.env_hidden.clone(),
active_overlays: self.active_overlays.clone(), active_overlays: self.active_overlays.clone(),
recursion_count: self.recursion_count.to_owned(), recursion_count: self.recursion_count,
} }
} }
@ -186,7 +186,7 @@ impl Stack {
env_vars, env_vars,
env_hidden: self.env_hidden.clone(), env_hidden: self.env_hidden.clone(),
active_overlays: self.active_overlays.clone(), active_overlays: self.active_overlays.clone(),
recursion_count: self.recursion_count.to_owned(), recursion_count: self.recursion_count,
} }
} }