From 112e5d096fc2f7469f9621eb6e38f82f2b7b927f Mon Sep 17 00:00:00 2001 From: Pirmin Kalberer Date: Thu, 19 Sep 2019 21:39:47 +0200 Subject: [PATCH 1/2] Include config path in env command --- src/commands/env.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/commands/env.rs b/src/commands/env.rs index 6fc26507cc..9a98164ef2 100644 --- a/src/commands/env.rs +++ b/src/commands/env.rs @@ -1,3 +1,4 @@ +use crate::data::config; use crate::data::{Dictionary, Value}; use crate::errors::ShellError; use crate::prelude::*; @@ -41,6 +42,9 @@ pub fn get_environment(tag: Tag) -> Result, Box Date: Thu, 19 Sep 2019 23:10:29 +0200 Subject: [PATCH 2/2] Include history path in env command --- src/cli.rs | 2 +- src/commands/env.rs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cli.rs b/src/cli.rs index ef809ecc10..d0c70876f6 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -212,7 +212,7 @@ fn load_plugins(context: &mut Context) -> Result<(), ShellError> { Ok(()) } -struct History; +pub struct History; impl History { pub fn path() -> PathBuf { diff --git a/src/commands/env.rs b/src/commands/env.rs index 9a98164ef2..c0af785557 100644 --- a/src/commands/env.rs +++ b/src/commands/env.rs @@ -1,3 +1,4 @@ +use crate::cli::History; use crate::data::config; use crate::data::{Dictionary, Value}; use crate::errors::ShellError; @@ -45,6 +46,9 @@ pub fn get_environment(tag: Tag) -> Result, Box