From c8a7116ec79088b5cb0902a1a6a75476f6e6c94b Mon Sep 17 00:00:00 2001 From: Sam Hedin Date: Tue, 23 Jun 2020 19:54:07 +0200 Subject: [PATCH] fmt --- .../nu-cli/src/env/directory_specific_environment.rs | 10 ++++++++-- crates/nu-cli/src/env/environment.rs | 2 +- crates/nu-cli/src/env/environment_syncer.rs | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/crates/nu-cli/src/env/directory_specific_environment.rs b/crates/nu-cli/src/env/directory_specific_environment.rs index 3f1be5a0e7..f4d26886f4 100644 --- a/crates/nu-cli/src/env/directory_specific_environment.rs +++ b/crates/nu-cli/src/env/directory_specific_environment.rs @@ -65,11 +65,17 @@ impl DirectorySpecificEnvironment { toml_doc .get("env") .ok_or_else(|| { - Error::new(ErrorKind::InvalidData, format!("[env] section missing in {:?}", wdirenv)) + Error::new( + ErrorKind::InvalidData, + format!("[env] section missing in {:?}", wdirenv), + ) })? .as_table() .ok_or_else(|| { - Error::new(ErrorKind::InvalidData, format!("[env] section malformed in {:?}", wdirenv)) + Error::new( + ErrorKind::InvalidData, + format!("[env] section malformed in {:?}", wdirenv), + ) })? .iter() .for_each(|(dir_env_key, dir_env_val)| { diff --git a/crates/nu-cli/src/env/environment.rs b/crates/nu-cli/src/env/environment.rs index 64b7a790be..0de1e45ec2 100644 --- a/crates/nu-cli/src/env/environment.rs +++ b/crates/nu-cli/src/env/environment.rs @@ -1,10 +1,10 @@ use crate::data::config::Conf; use crate::env::directory_specific_environment::*; use indexmap::{indexmap, IndexSet}; +use nu_errors::ShellError; use nu_protocol::{UntaggedValue, Value}; use std::ffi::OsString; use std::fmt::Debug; -use nu_errors::ShellError; pub trait Env: Debug + Send { fn env(&self) -> Option; diff --git a/crates/nu-cli/src/env/environment_syncer.rs b/crates/nu-cli/src/env/environment_syncer.rs index 491de7b71f..2a22884912 100644 --- a/crates/nu-cli/src/env/environment_syncer.rs +++ b/crates/nu-cli/src/env/environment_syncer.rs @@ -1,9 +1,9 @@ use crate::context::Context; use crate::data::config::{Conf, NuConfig}; use crate::env::environment::{Env, Environment}; +use nu_source::Text; use parking_lot::Mutex; use std::sync::Arc; -use nu_source::Text; pub struct EnvironmentSyncer { pub env: Arc>>,