From 1d2d31580b2924ca184f45c79d46e61d63a5e7a0 Mon Sep 17 00:00:00 2001 From: JT <547158+jntrnr@users.noreply.github.com> Date: Fri, 1 Apr 2022 12:00:50 +1300 Subject: [PATCH] Allow strings for prompt env vars (#5052) --- crates/nu-cli/src/prompt_update.rs | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs index 4ff3bce7b..9cc9ec36f 100644 --- a/crates/nu-cli/src/prompt_update.rs +++ b/crates/nu-cli/src/prompt_update.rs @@ -2,7 +2,6 @@ use crate::util::report_error; use crate::NushellPrompt; use log::info; use nu_engine::eval_subexpression; -use nu_parser::parse; use nu_protocol::{ engine::{EngineState, Stack, StateWorkingSet}, Config, PipelineData, Span, Value, @@ -59,28 +58,7 @@ fn get_prompt_string( } } } - Value::String { val: source, .. } => { - let mut working_set = StateWorkingSet::new(engine_state); - let (block, _) = parse(&mut working_set, None, source.as_bytes(), true, &[]); - // Use eval_subexpression to force a redirection of output, so we can use everything in prompt - let ret_val = eval_subexpression( - engine_state, - stack, - &block, - PipelineData::new(Span::new(0, 0)), // Don't try this at home, 0 span is ignored - ) - .ok(); - if is_perf_true { - info!( - "get_prompt_string (string) {}:{}:{}", - file!(), - line!(), - column!() - ); - } - - ret_val - } + Value::String { .. } => Some(PipelineData::Value(v.clone(), None)), _ => None, }) .and_then(|pipeline_data| {