From 9ef71f76446a02352b4af314e42b1ab5ecd05510 Mon Sep 17 00:00:00 2001 From: overlookmotel Date: Tue, 30 Jul 2024 11:59:14 +0100 Subject: [PATCH] Revert to `drain` + `collect` --- crates/oxc_semantic/src/builder.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/oxc_semantic/src/builder.rs b/crates/oxc_semantic/src/builder.rs index 16cc2e1d5d2c2..2f479c24128f6 100644 --- a/crates/oxc_semantic/src/builder.rs +++ b/crates/oxc_semantic/src/builder.rs @@ -2,7 +2,6 @@ use std::{ cell::{Cell, RefCell}, - mem, path::PathBuf, sync::Arc, }; @@ -29,7 +28,7 @@ use crate::{ module_record::ModuleRecordBuilder, node::{AstNodeId, AstNodes, NodeFlags}, reference::{Reference, ReferenceFlag, ReferenceId}, - scope::{ScopeFlags, ScopeId, ScopeTree}, + scope::{Bindings, ScopeFlags, ScopeId, ScopeTree}, symbol::{SymbolFlags, SymbolId, SymbolTable}, unresolved_stack::UnresolvedReferencesStack, JSDocFinder, Semantic, @@ -678,7 +677,8 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> { // Move all bindings from catch clause param scope to catch clause body scope // to make it easier to resolve references and check redeclare errors if self.scope.get_flags(parent_scope_id).is_catch_clause() { - let parent_bindings = mem::take(self.scope.get_bindings_mut(parent_scope_id)); + let parent_bindings = + self.scope.get_bindings_mut(parent_scope_id).drain(..).collect::(); *self.scope.get_bindings_mut(self.current_scope_id) = parent_bindings; }