fix more merge conflicts

crates/nu-command/Cargo.toml

@@ -9,14 +9,9 @@ edition = "2018"
 nu-engine = { path = "../nu-engine" }
 nu-json = { path = "../nu-json" }
 nu-protocol = { path = "../nu-protocol" }
-<<<<<<< HEAD
-nu-engine = { path = "../nu-engine" }
-nu-parser = {path = "../nu-parser"}
-=======
 nu-table = { path = "../nu-table" }
 
 # Potential dependencies for extras
 glob = "0.3.0"
 thiserror = "1.0.29"
 sysinfo = "0.20.4"
->>>>>>> 3567bbbf32302dbc3cbf97a39b03efa3bd3e8bb5

crates/nu-command/src/core_commands/mod.rs

@@ -5,6 +5,7 @@ mod help;
 mod if_;
 mod let_;
 mod module;
+mod source;
 mod use_;
 
 pub use alias::Alias;
@@ -14,4 +15,5 @@ pub use help::Help;
 pub use if_::If;
 pub use let_::Let;
 pub use module::Module;
+pub use source::Source;
 pub use use_::Use;

crates/nu-command/src/core_commands/source.rs

@@ -1,10 +1,6 @@
-use nu_engine::{eval_block, eval_expression};
-use nu_parser::parse;
-use nu_protocol::ast::{Block, Call};
-use nu_protocol::engine::{Command, EngineState, EvaluationContext, StateWorkingSet};
-use nu_protocol::{ShellError, Signature, SyntaxShape, Value};
-use std::task::Context;
-use std::{borrow::Cow, path::Path, path::PathBuf};
+use nu_protocol::ast::Call;
+use nu_protocol::engine::{Command, EvaluationContext};
+use nu_protocol::{Signature, SyntaxShape, Value};
 
 /// Source a file for environment variables.
 pub struct Source;

crates/nu-command/src/default_context.rs

@@ -5,14 +5,11 @@ use nu_protocol::{
     Signature,
 };
 
-<<<<<<< HEAD
-use crate::{Alias, Benchmark, BuildString, Def, Do, Each, For, If, Length, Let, LetEnv, Source};
-=======
 use crate::{
     Alias, Benchmark, BuildString, Def, Do, Each, External, For, From, FromJson, Git, GitCheckout,
-    Help, If, Length, Let, LetEnv, Lines, ListGitBranches, Ls, Module, Ps, Sys, Table, Use, Where,
+    Help, If, Length, Let, LetEnv, Lines, ListGitBranches, Ls, Module, Ps, Source, Sys, Table, Use,
+    Where,
 };
->>>>>>> 3567bbbf32302dbc3cbf97a39b03efa3bd3e8bb5
 
 pub fn create_default_context() -> Rc<RefCell<EngineState>> {
     let engine_state = Rc::new(RefCell::new(EngineState::new()));

crates/nu-command/src/lib.rs

@@ -1,29 +1,5 @@
 mod core_commands;
 mod default_context;
-<<<<<<< HEAD
-mod do_;
-mod each;
-mod for_;
-mod if_;
-mod length;
-mod let_;
-mod let_env;
-mod source;
-
-pub use alias::Alias;
-pub use benchmark::Benchmark;
-pub use build_string::BuildString;
-pub use def::Def;
-pub use default_context::create_default_context;
-pub use do_::Do;
-pub use each::Each;
-pub use for_::For;
-pub use if_::If;
-pub use length::Length;
-pub use let_::Let;
-pub use let_env::LetEnv;
-pub use source::Source;
-=======
 mod env;
 mod experimental;
 mod filesystem;
@@ -43,4 +19,3 @@ pub use formats::*;
 pub use strings::*;
 pub use system::*;
 pub use viewers::*;
->>>>>>> 3567bbbf32302dbc3cbf97a39b03efa3bd3e8bb5

crates/nu-engine/src/eval.rs

@@ -1,12 +1,7 @@
 use nu_parser::parse;
 use nu_protocol::ast::{Block, Call, Expr, Expression, Operator, Statement};
-<<<<<<< HEAD
-use nu_protocol::engine::{EngineState, EvaluationContext, StateWorkingSet};
-use nu_protocol::{Range, ShellError, Span, Value};
-=======
 use nu_protocol::engine::EvaluationContext;
 use nu_protocol::{Range, ShellError, Span, Type, Value};
->>>>>>> 3567bbbf32302dbc3cbf97a39b03efa3bd3e8bb5
 
 pub fn eval_operator(op: &Expression) -> Result<Operator, ShellError> {
     match op {