diff --git a/crates/nu-cli/src/commands/autoview/command.rs b/crates/nu-cli/src/commands/autoview/command.rs index 4c62051a0a..24a9a7d13a 100644 --- a/crates/nu-cli/src/commands/autoview/command.rs +++ b/crates/nu-cli/src/commands/autoview/command.rs @@ -133,29 +133,6 @@ pub async fn autoview(context: RunnableContext) -> Result { out!("{}", s); } - Value { - value: UntaggedValue::Primitive(Primitive::Line(ref s)), - tag: Tag { anchor, span }, - } if anchor.is_some() => { - if let Some(text) = text { - let mut stream = VecDeque::new(); - stream.push_back( - UntaggedValue::string(s).into_value(Tag { anchor, span }), - ); - let command_args = - create_default_command_args(&context).with_input(stream); - let result = text.run(command_args).await?; - result.collect::>().await; - } else { - out!("{}\n", s); - } - } - Value { - value: UntaggedValue::Primitive(Primitive::Line(s)), - .. - } => { - out!("{}\n", s); - } Value { value: UntaggedValue::Primitive(Primitive::Path(s)), .. diff --git a/crates/nu-cli/src/commands/classified/external.rs b/crates/nu-cli/src/commands/classified/external.rs index 69b4c75be3..c9dc745e33 100644 --- a/crates/nu-cli/src/commands/classified/external.rs +++ b/crates/nu-cli/src/commands/classified/external.rs @@ -221,8 +221,7 @@ fn spawn( for value in block_on_stream(input) { match &value.value { UntaggedValue::Primitive(Primitive::Nothing) => continue, - UntaggedValue::Primitive(Primitive::String(s)) - | UntaggedValue::Primitive(Primitive::Line(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { if stdin_write.write(s.as_bytes()).is_err() { // Other side has closed, so exit return Ok(()); diff --git a/crates/nu-cli/src/commands/hash_/base64_.rs b/crates/nu-cli/src/commands/hash_/base64_.rs index 9cbe76903c..695a39a1c5 100644 --- a/crates/nu-cli/src/commands/hash_/base64_.rs +++ b/crates/nu-cli/src/commands/hash_/base64_.rs @@ -164,8 +164,7 @@ fn action( tag: impl Into, ) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let base64_config_enum: base64::Config = if &base64_config.character_set == "standard" { base64::STANDARD } else if &base64_config.character_set == "standard-no-padding" { diff --git a/crates/nu-cli/src/commands/lines.rs b/crates/nu-cli/src/commands/lines.rs index fc6bb4ec9d..0b4e2060bf 100644 --- a/crates/nu-cli/src/commands/lines.rs +++ b/crates/nu-cli/src/commands/lines.rs @@ -63,10 +63,6 @@ async fn lines(args: CommandArgs) -> Result { Value { value: UntaggedValue::Primitive(Primitive::String(st)), .. - } - | Value { - value: UntaggedValue::Primitive(Primitive::Line(st)), - .. } => { let mut leftover_string = leftover_string.lock(); @@ -84,7 +80,9 @@ async fn lines(args: CommandArgs) -> Result { let success_lines: Vec<_> = lines .iter() - .map(|x| ReturnSuccess::value(UntaggedValue::line(x).into_untagged_value())) + .map(|x| { + ReturnSuccess::value(UntaggedValue::string(x).into_untagged_value()) + }) .collect(); futures::stream::iter(success_lines) diff --git a/crates/nu-cli/src/commands/path/mod.rs b/crates/nu-cli/src/commands/path/mod.rs index f3423f38b2..c88c0fb4c0 100644 --- a/crates/nu-cli/src/commands/path/mod.rs +++ b/crates/nu-cli/src/commands/path/mod.rs @@ -47,8 +47,7 @@ where { let v = match &v.value { UntaggedValue::Primitive(Primitive::Path(buf)) => action(buf, args).into_value(v.tag()), - UntaggedValue::Primitive(Primitive::String(s)) - | UntaggedValue::Primitive(Primitive::Line(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { action(s.as_ref(), args).into_value(v.tag()) } other => { diff --git a/crates/nu-cli/src/commands/str_/capitalize.rs b/crates/nu-cli/src/commands/str_/capitalize.rs index 15bc6ac3a6..72867af55e 100644 --- a/crates/nu-cli/src/commands/str_/capitalize.rs +++ b/crates/nu-cli/src/commands/str_/capitalize.rs @@ -72,8 +72,7 @@ async fn operate(args: CommandArgs) -> Result { fn action(input: &Value, tag: impl Into) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let mut capitalized = String::new(); for (idx, character) in s.chars().enumerate() { diff --git a/crates/nu-cli/src/commands/str_/case/mod.rs b/crates/nu-cli/src/commands/str_/case/mod.rs index 2ecdd9a238..2af30b2c00 100644 --- a/crates/nu-cli/src/commands/str_/case/mod.rs +++ b/crates/nu-cli/src/commands/str_/case/mod.rs @@ -61,8 +61,7 @@ where F: Fn(&str) -> String + Send + Sync + 'static, { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { Ok(UntaggedValue::string(case_operation(s)).into_value(tag)) } other => { diff --git a/crates/nu-cli/src/commands/str_/contains.rs b/crates/nu-cli/src/commands/str_/contains.rs index 35cdc28790..d777870ad5 100644 --- a/crates/nu-cli/src/commands/str_/contains.rs +++ b/crates/nu-cli/src/commands/str_/contains.rs @@ -96,8 +96,7 @@ fn action( tag: impl Into, ) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let contains = if insensitive { s.to_lowercase().find(&pattern.to_lowercase()).is_some() } else { diff --git a/crates/nu-cli/src/commands/str_/downcase.rs b/crates/nu-cli/src/commands/str_/downcase.rs index 3814954040..6ddf4af6d9 100644 --- a/crates/nu-cli/src/commands/str_/downcase.rs +++ b/crates/nu-cli/src/commands/str_/downcase.rs @@ -72,8 +72,7 @@ async fn operate(args: CommandArgs) -> Result { fn action(input: &Value, tag: impl Into) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { Ok(UntaggedValue::string(s.to_ascii_lowercase()).into_value(tag)) } other => { diff --git a/crates/nu-cli/src/commands/str_/ends_with.rs b/crates/nu-cli/src/commands/str_/ends_with.rs index 92f2296e62..e4b0fe97c9 100644 --- a/crates/nu-cli/src/commands/str_/ends_with.rs +++ b/crates/nu-cli/src/commands/str_/ends_with.rs @@ -75,8 +75,7 @@ async fn operate(args: CommandArgs) -> Result { fn action(input: &Value, pattern: &str, tag: impl Into) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let ends_with = s.ends_with(pattern); Ok(UntaggedValue::boolean(ends_with).into_value(tag)) } diff --git a/crates/nu-cli/src/commands/str_/find_replace.rs b/crates/nu-cli/src/commands/str_/find_replace.rs index 95dfa1abde..99569374fb 100644 --- a/crates/nu-cli/src/commands/str_/find_replace.rs +++ b/crates/nu-cli/src/commands/str_/find_replace.rs @@ -105,8 +105,7 @@ fn action( all: bool, ) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let find = &options.0; let replacement = &options.1; diff --git a/crates/nu-cli/src/commands/str_/index_of.rs b/crates/nu-cli/src/commands/str_/index_of.rs index 44967915cc..e1281eb2f7 100644 --- a/crates/nu-cli/src/commands/str_/index_of.rs +++ b/crates/nu-cli/src/commands/str_/index_of.rs @@ -137,8 +137,7 @@ fn action( ) -> Result { let r = process_range(&input, &range)?; match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let start_index = r.0 as usize; let end_index = r.1 as usize; @@ -169,15 +168,13 @@ fn action( fn process_range(input: &Value, range: &Value) -> Result { let input_len = match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => s.len(), + UntaggedValue::Primitive(Primitive::String(s)) => s.len(), _ => 0, }; let min_index_str = String::from("0"); let max_index_str = input_len.to_string(); let r = match &range.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let indexes: Vec<&str> = s.split(',').collect(); let start_index = indexes.get(0).unwrap_or(&&min_index_str[..]).to_string(); diff --git a/crates/nu-cli/src/commands/str_/lpad.rs b/crates/nu-cli/src/commands/str_/lpad.rs index 8541c33c2e..0d55ad29ce 100644 --- a/crates/nu-cli/src/commands/str_/lpad.rs +++ b/crates/nu-cli/src/commands/str_/lpad.rs @@ -111,8 +111,7 @@ fn action( tag: impl Into, ) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { if length < s.len() { Ok(UntaggedValue::string(&s[0..length]).into_value(tag)) } else { diff --git a/crates/nu-cli/src/commands/str_/rpad.rs b/crates/nu-cli/src/commands/str_/rpad.rs index 700ef92ea5..f2740732d5 100644 --- a/crates/nu-cli/src/commands/str_/rpad.rs +++ b/crates/nu-cli/src/commands/str_/rpad.rs @@ -111,8 +111,7 @@ fn action( tag: impl Into, ) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { if length < s.len() { Ok(UntaggedValue::string(&s[0..length]).into_value(tag)) } else { diff --git a/crates/nu-cli/src/commands/str_/starts_with.rs b/crates/nu-cli/src/commands/str_/starts_with.rs index dd4ff0fa01..2a8c21e3df 100644 --- a/crates/nu-cli/src/commands/str_/starts_with.rs +++ b/crates/nu-cli/src/commands/str_/starts_with.rs @@ -75,8 +75,7 @@ async fn operate(args: CommandArgs) -> Result { fn action(input: &Value, pattern: &str, tag: impl Into) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let starts_with = s.starts_with(pattern); Ok(UntaggedValue::boolean(starts_with).into_value(tag)) } diff --git a/crates/nu-cli/src/commands/str_/substring.rs b/crates/nu-cli/src/commands/str_/substring.rs index bba59bd3a3..cbde75dcea 100644 --- a/crates/nu-cli/src/commands/str_/substring.rs +++ b/crates/nu-cli/src/commands/str_/substring.rs @@ -122,8 +122,7 @@ fn action(input: &Value, options: &Substring, tag: impl Into) -> Result { + UntaggedValue::Primitive(Primitive::String(s)) => { let len: isize = s.len().try_into().map_err(|_| { ShellError::labeled_error( "could not perform substring", diff --git a/crates/nu-cli/src/commands/str_/to_datetime.rs b/crates/nu-cli/src/commands/str_/to_datetime.rs index 696e57c438..d3ee6e3059 100644 --- a/crates/nu-cli/src/commands/str_/to_datetime.rs +++ b/crates/nu-cli/src/commands/str_/to_datetime.rs @@ -109,8 +109,7 @@ fn action( tag: impl Into, ) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let out = match options { Some(dt) => match DateTime::parse_from_str(s, &dt.0) { Ok(d) => UntaggedValue::date(d), diff --git a/crates/nu-cli/src/commands/str_/to_decimal.rs b/crates/nu-cli/src/commands/str_/to_decimal.rs index 82caf5a9ce..b5e672a6a9 100644 --- a/crates/nu-cli/src/commands/str_/to_decimal.rs +++ b/crates/nu-cli/src/commands/str_/to_decimal.rs @@ -75,8 +75,7 @@ async fn operate(args: CommandArgs) -> Result { fn action(input: &Value, tag: impl Into) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let other = s.trim(); let out = match BigDecimal::from_str(other) { Ok(v) => UntaggedValue::decimal(v), diff --git a/crates/nu-cli/src/commands/str_/to_integer.rs b/crates/nu-cli/src/commands/str_/to_integer.rs index 9dbf21dffd..554bb7a95d 100644 --- a/crates/nu-cli/src/commands/str_/to_integer.rs +++ b/crates/nu-cli/src/commands/str_/to_integer.rs @@ -97,8 +97,7 @@ async fn operate(args: CommandArgs) -> Result { fn action(input: &Value, tag: impl Into, radix: u32) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { let trimmed = s.trim(); let out = match trimmed { diff --git a/crates/nu-cli/src/commands/str_/trim/mod.rs b/crates/nu-cli/src/commands/str_/trim/mod.rs index 7debedec2f..352c9a7677 100644 --- a/crates/nu-cli/src/commands/str_/trim/mod.rs +++ b/crates/nu-cli/src/commands/str_/trim/mod.rs @@ -80,8 +80,7 @@ where { let tag = tag.into(); match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { Ok(UntaggedValue::string(trim_operation(s, char_)).into_value(tag)) } other => match mode { diff --git a/crates/nu-cli/src/commands/str_/upcase.rs b/crates/nu-cli/src/commands/str_/upcase.rs index 9857430e51..a46e87af7d 100644 --- a/crates/nu-cli/src/commands/str_/upcase.rs +++ b/crates/nu-cli/src/commands/str_/upcase.rs @@ -72,8 +72,7 @@ async fn operate(args: CommandArgs) -> Result { fn action(input: &Value, tag: impl Into) -> Result { match &input.value { - UntaggedValue::Primitive(Primitive::Line(s)) - | UntaggedValue::Primitive(Primitive::String(s)) => { + UntaggedValue::Primitive(Primitive::String(s)) => { Ok(UntaggedValue::string(s.to_ascii_uppercase()).into_value(tag)) } other => { diff --git a/crates/nu-cli/src/commands/to_delimited_data.rs b/crates/nu-cli/src/commands/to_delimited_data.rs index db2da3c475..e1871ee8f9 100644 --- a/crates/nu-cli/src/commands/to_delimited_data.rs +++ b/crates/nu-cli/src/commands/to_delimited_data.rs @@ -133,7 +133,6 @@ pub fn clone_tagged_value(v: &Value) -> Value { fn to_string_tagged_value(v: &Value) -> Result { match &v.value { UntaggedValue::Primitive(Primitive::String(_)) - | UntaggedValue::Primitive(Primitive::Line(_)) | UntaggedValue::Primitive(Primitive::Filesize(_)) | UntaggedValue::Primitive(Primitive::Boolean(_)) | UntaggedValue::Primitive(Primitive::Decimal(_)) diff --git a/crates/nu-cli/src/commands/to_json.rs b/crates/nu-cli/src/commands/to_json.rs index b430797a4c..4bce07e381 100644 --- a/crates/nu-cli/src/commands/to_json.rs +++ b/crates/nu-cli/src/commands/to_json.rs @@ -98,7 +98,6 @@ pub fn value_to_json_value(v: &Value) -> Result { UntaggedValue::Primitive(Primitive::Nothing) => serde_json::Value::Null, UntaggedValue::Primitive(Primitive::Pattern(s)) => serde_json::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::String(s)) => serde_json::Value::String(s.clone()), - UntaggedValue::Primitive(Primitive::Line(s)) => serde_json::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::ColumnPath(path)) => serde_json::Value::Array( path.iter() .map(|x| match &x.unspanned { diff --git a/crates/nu-cli/src/commands/to_toml.rs b/crates/nu-cli/src/commands/to_toml.rs index 844f848568..77e0907687 100644 --- a/crates/nu-cli/src/commands/to_toml.rs +++ b/crates/nu-cli/src/commands/to_toml.rs @@ -60,7 +60,6 @@ fn helper(v: &Value) -> Result { } UntaggedValue::Primitive(Primitive::Pattern(s)) => toml::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::String(s)) => toml::Value::String(s.clone()), - UntaggedValue::Primitive(Primitive::Line(s)) => toml::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::Path(s)) => { toml::Value::String(s.display().to_string()) } diff --git a/crates/nu-cli/src/commands/to_yaml.rs b/crates/nu-cli/src/commands/to_yaml.rs index bc1d2f1408..932277c9e4 100644 --- a/crates/nu-cli/src/commands/to_yaml.rs +++ b/crates/nu-cli/src/commands/to_yaml.rs @@ -60,7 +60,6 @@ pub fn value_to_yaml_value(v: &Value) -> Result { UntaggedValue::Primitive(Primitive::Nothing) => serde_yaml::Value::Null, UntaggedValue::Primitive(Primitive::Pattern(s)) => serde_yaml::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::String(s)) => serde_yaml::Value::String(s.clone()), - UntaggedValue::Primitive(Primitive::Line(s)) => serde_yaml::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::ColumnPath(path)) => { let mut out = vec![]; diff --git a/crates/nu-cli/src/commands/url_/mod.rs b/crates/nu-cli/src/commands/url_/mod.rs index c2161cc16d..2b089673bd 100644 --- a/crates/nu-cli/src/commands/url_/mod.rs +++ b/crates/nu-cli/src/commands/url_/mod.rs @@ -26,8 +26,7 @@ where { let a = |url| UntaggedValue::string(action(url)); let v = match &v.value { - UntaggedValue::Primitive(Primitive::String(s)) - | UntaggedValue::Primitive(Primitive::Line(s)) => match Url::parse(s) { + UntaggedValue::Primitive(Primitive::String(s)) => match Url::parse(s) { Ok(url) => a(&url).into_value(v.tag()), Err(_) => UntaggedValue::string("").into_value(v.tag()), }, diff --git a/crates/nu-cli/src/evaluate/operator.rs b/crates/nu-cli/src/evaluate/operator.rs index a1584999f0..5178fb5abc 100644 --- a/crates/nu-cli/src/evaluate/operator.rs +++ b/crates/nu-cli/src/evaluate/operator.rs @@ -63,18 +63,6 @@ fn string_contains( UntaggedValue::Primitive(Primitive::String(l)), UntaggedValue::Primitive(Primitive::String(r)), ) => Ok(l.contains(r)), - ( - UntaggedValue::Primitive(Primitive::Line(l)), - UntaggedValue::Primitive(Primitive::String(r)), - ) => Ok(l.contains(r)), - ( - UntaggedValue::Primitive(Primitive::String(l)), - UntaggedValue::Primitive(Primitive::Line(r)), - ) => Ok(l.contains(r)), - ( - UntaggedValue::Primitive(Primitive::Line(l)), - UntaggedValue::Primitive(Primitive::Line(r)), - ) => Ok(l.contains(r)), _ => Err((left.type_name(), right.type_name())), } } diff --git a/crates/nu-cli/tests/commands/lines.rs b/crates/nu-cli/tests/commands/lines.rs index 172fc43b41..c03f7792a7 100644 --- a/crates/nu-cli/tests/commands/lines.rs +++ b/crates/nu-cli/tests/commands/lines.rs @@ -31,7 +31,7 @@ fn lines_proper_buffering() { "# )); - assert_eq!(actual.out, "[8194,4]"); + assert_eq!(actual.out, "[8193,3]"); } #[test] diff --git a/crates/nu-data/src/base.rs b/crates/nu-data/src/base.rs index 67095305ae..c9384d10ad 100644 --- a/crates/nu-data/src/base.rs +++ b/crates/nu-data/src/base.rs @@ -146,9 +146,6 @@ pub fn coerce_compare_primitive( } (Nothing, Nothing) => CompareValues::Booleans(true, true), (String(left), String(right)) => CompareValues::String(left.clone(), right.clone()), - (Line(left), String(right)) => CompareValues::String(left.clone(), right.clone()), - (String(left), Line(right)) => CompareValues::String(left.clone(), right.clone()), - (Line(left), Line(right)) => CompareValues::String(left.clone(), right.clone()), (Date(left), Date(right)) => CompareValues::Date(*left, *right), (Date(left), Duration(right)) => CompareValues::DateDuration(*left, right.clone()), (Boolean(left), Boolean(right)) => CompareValues::Booleans(*left, *right), diff --git a/crates/nu-data/src/base/shape.rs b/crates/nu-data/src/base/shape.rs index b20d1c2106..23cff8acf3 100644 --- a/crates/nu-data/src/base/shape.rs +++ b/crates/nu-data/src/base/shape.rs @@ -71,7 +71,6 @@ impl InlineShape { Primitive::Decimal(decimal) => InlineShape::Decimal(decimal.clone()), Primitive::Filesize(bytesize) => InlineShape::Bytesize(*bytesize), Primitive::String(string) => InlineShape::String(string.clone()), - Primitive::Line(string) => InlineShape::Line(string.clone()), Primitive::ColumnPath(path) => InlineShape::ColumnPath(path.clone()), Primitive::Pattern(pattern) => InlineShape::Pattern(pattern.clone()), Primitive::Boolean(boolean) => InlineShape::Boolean(*boolean), diff --git a/crates/nu-data/src/config.rs b/crates/nu-data/src/config.rs index bfb186f705..69f030f79f 100644 --- a/crates/nu-data/src/config.rs +++ b/crates/nu-data/src/config.rs @@ -83,7 +83,6 @@ fn helper(v: &Value) -> Result { } UntaggedValue::Primitive(Primitive::Pattern(s)) => toml::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::String(s)) => toml::Value::String(s.clone()), - UntaggedValue::Primitive(Primitive::Line(s)) => toml::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::Path(s)) => { toml::Value::String(s.display().to_string()) } diff --git a/crates/nu-data/src/types.rs b/crates/nu-data/src/types.rs index 2667ec8ef5..e98fdc056c 100644 --- a/crates/nu-data/src/types.rs +++ b/crates/nu-data/src/types.rs @@ -81,10 +81,6 @@ impl ExtractType for String { value: UntaggedValue::Primitive(Primitive::String(string)), .. } => Ok(string.clone()), - Value { - value: UntaggedValue::Primitive(Primitive::Line(string)), - .. - } => Ok(string.clone()), other => Err(ShellError::type_error("String", other.spanned_type_name())), } } diff --git a/crates/nu-protocol/src/type_shape.rs b/crates/nu-protocol/src/type_shape.rs index 6d8c0efd0c..9eb0dce11f 100644 --- a/crates/nu-protocol/src/type_shape.rs +++ b/crates/nu-protocol/src/type_shape.rs @@ -140,7 +140,6 @@ impl Type { Primitive::Decimal(_) => Type::Decimal, Primitive::Filesize(_) => Type::Filesize, Primitive::String(_) => Type::String, - Primitive::Line(_) => Type::Line, Primitive::ColumnPath(_) => Type::ColumnPath, Primitive::Pattern(_) => Type::Pattern, Primitive::Boolean(_) => Type::Boolean, diff --git a/crates/nu-protocol/src/value.rs b/crates/nu-protocol/src/value.rs index bc683dba27..69d48f7d8e 100644 --- a/crates/nu-protocol/src/value.rs +++ b/crates/nu-protocol/src/value.rs @@ -162,11 +162,6 @@ impl UntaggedValue { UntaggedValue::Primitive(Primitive::String(s.into())) } - /// Helper for creating line values - pub fn line(s: impl Into) -> UntaggedValue { - UntaggedValue::Primitive(Primitive::Line(s.into())) - } - /// Helper for creating column-path values pub fn column_path(s: &str, span: Span) -> UntaggedValue { let s = s.to_string().spanned(span); @@ -317,7 +312,6 @@ impl Value { pub fn as_string(&self) -> Result { match &self.value { UntaggedValue::Primitive(Primitive::String(string)) => Ok(string.clone()), - UntaggedValue::Primitive(Primitive::Line(line)) => Ok(line.clone() + "\n"), UntaggedValue::Primitive(Primitive::Path(path)) => { Ok(path.to_string_lossy().to_string()) } @@ -584,8 +578,6 @@ pub trait StringExt { fn to_string_untagged_value(&self) -> UntaggedValue; fn to_string_value(&self, tag: Tag) -> Value; fn to_string_value_create_tag(&self) -> Value; - fn to_line_value(&self, tag: Tag) -> Value; - fn to_line_untagged_value(&self) -> UntaggedValue; fn to_column_path_value(&self, tag: Tag) -> Value; fn to_column_path_untagged_value(&self, span: Span) -> UntaggedValue; fn to_pattern_value(&self, tag: Tag) -> Value; @@ -615,17 +607,6 @@ impl StringExt for String { UntaggedValue::string(self) } - fn to_line_value(&self, the_tag: Tag) -> Value { - Value { - value: UntaggedValue::Primitive(Primitive::Line(self.to_string())), - tag: the_tag, - } - } - - fn to_line_untagged_value(&self) -> UntaggedValue { - UntaggedValue::line(self) - } - fn to_column_path_value(&self, the_tag: Tag) -> Value { Value { value: UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::build( @@ -656,8 +637,6 @@ pub trait StrExt { fn to_str_untagged_value(&self) -> UntaggedValue; fn to_str_value(&self, tag: Tag) -> Value; fn to_str_value_create_tag(&self) -> Value; - fn to_line_value(&self, tag: Tag) -> Value; - fn to_line_untagged_value(&self) -> UntaggedValue; fn to_column_path_value(&self, tag: Tag) -> Value; fn to_column_path_untagged_value(&self, span: Span) -> UntaggedValue; fn to_pattern_value(&self, tag: Tag) -> Value; @@ -687,17 +666,6 @@ impl StrExt for &str { UntaggedValue::string(*self) } - fn to_line_value(&self, the_tag: Tag) -> Value { - Value { - value: UntaggedValue::Primitive(Primitive::Line(self.to_string())), - tag: the_tag, - } - } - - fn to_line_untagged_value(&self) -> UntaggedValue { - UntaggedValue::line(*self) - } - fn to_column_path_value(&self, the_tag: Tag) -> Value { Value { value: UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::build( @@ -1015,12 +983,6 @@ mod tests { ); } - #[test] - fn test_string_to_line_untagged_value() { - let a_line = r"this is some line\n"; - assert_eq!(a_line.to_line_untagged_value(), UntaggedValue::line(a_line)); - } - #[test] fn test_string_to_pattern_untagged_value() { let a_pattern = r"[a-zA-Z0-9 ]"; diff --git a/crates/nu-protocol/src/value/debug.rs b/crates/nu-protocol/src/value/debug.rs index 573db8a556..3c7766cc41 100644 --- a/crates/nu-protocol/src/value/debug.rs +++ b/crates/nu-protocol/src/value/debug.rs @@ -35,7 +35,6 @@ impl PrettyType for Primitive { Primitive::Decimal(_) => ty("decimal"), Primitive::Filesize(_) => ty("filesize"), Primitive::String(_) => ty("string"), - Primitive::Line(_) => ty("line"), Primitive::ColumnPath(_) => ty("column-path"), Primitive::Pattern(_) => ty("pattern"), Primitive::Boolean(_) => ty("boolean"), @@ -73,7 +72,6 @@ impl PrettyDebug for Primitive { } Primitive::Filesize(bytes) => primitive_doc(bytes, "filesize"), Primitive::String(string) => prim(string), - Primitive::Line(string) => prim(string), Primitive::ColumnPath(path) => path.pretty(), Primitive::Pattern(pattern) => primitive_doc(pattern, "pattern"), Primitive::Boolean(boolean) => match boolean { diff --git a/crates/nu-protocol/src/value/primitive.rs b/crates/nu-protocol/src/value/primitive.rs index e7f6271f23..ea4d253034 100644 --- a/crates/nu-protocol/src/value/primitive.rs +++ b/crates/nu-protocol/src/value/primitive.rs @@ -34,8 +34,6 @@ pub enum Primitive { Filesize(u64), /// A string value String(String), - /// A string value with an implied carriage return (or cr/lf) ending - Line(String), /// A path to travel to reach a value in a table ColumnPath(ColumnPath), /// A glob pattern, eg foo* @@ -235,7 +233,6 @@ impl ShellTypeName for Primitive { Primitive::Decimal(_) => "decimal", Primitive::Filesize(_) => "filesize(in bytes)", Primitive::String(_) => "string", - Primitive::Line(_) => "line", Primitive::ColumnPath(_) => "column path", Primitive::Pattern(_) => "pattern", Primitive::Boolean(_) => "boolean", @@ -294,7 +291,6 @@ pub fn format_primitive(primitive: &Primitive, field_name: Option<&String>) -> S ), Primitive::Pattern(s) => s.to_string(), Primitive::String(s) => s.to_owned(), - Primitive::Line(s) => s.to_owned(), Primitive::ColumnPath(p) => { let mut members = p.iter(); let mut f = String::new(); diff --git a/crates/nu-stream/src/input.rs b/crates/nu-stream/src/input.rs index 6a4ad21e69..72b9b7a423 100644 --- a/crates/nu-stream/src/input.rs +++ b/crates/nu-stream/src/input.rs @@ -60,13 +60,6 @@ impl InputStream { value_tag = value_t; bytes.extend_from_slice(&s.into_bytes()); } - Some(Value { - value: UntaggedValue::Primitive(Primitive::Line(s)), - tag: value_t, - }) => { - value_tag = value_t; - bytes.extend_from_slice(&s.into_bytes()); - } Some(Value { value: UntaggedValue::Primitive(Primitive::Binary(b)), tag: value_t, diff --git a/crates/nu_plugin_post/src/post.rs b/crates/nu_plugin_post/src/post.rs index 3ed7d7d88d..112cf134a2 100644 --- a/crates/nu_plugin_post/src/post.rs +++ b/crates/nu_plugin_post/src/post.rs @@ -380,7 +380,6 @@ pub fn value_to_json_value(v: &Value) -> Result { UntaggedValue::Primitive(Primitive::Nothing) => serde_json::Value::Null, UntaggedValue::Primitive(Primitive::Pattern(s)) => serde_json::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::String(s)) => serde_json::Value::String(s.clone()), - UntaggedValue::Primitive(Primitive::Line(s)) => serde_json::Value::String(s.clone()), UntaggedValue::Primitive(Primitive::ColumnPath(path)) => serde_json::Value::Array( path.iter() .map(|x| match &x.unspanned { diff --git a/crates/nu_plugin_to_bson/src/to_bson.rs b/crates/nu_plugin_to_bson/src/to_bson.rs index aefa9ddc03..4b963a4291 100644 --- a/crates/nu_plugin_to_bson/src/to_bson.rs +++ b/crates/nu_plugin_to_bson/src/to_bson.rs @@ -46,7 +46,6 @@ pub fn value_to_bson_value(v: &Value) -> Result { } UntaggedValue::Primitive(Primitive::Nothing) => Bson::Null, UntaggedValue::Primitive(Primitive::String(s)) => Bson::String(s.clone()), - UntaggedValue::Primitive(Primitive::Line(s)) => Bson::String(s.clone()), UntaggedValue::Primitive(Primitive::ColumnPath(path)) => Bson::Array( path.iter() .map(|x| match &x.unspanned { diff --git a/crates/nu_plugin_to_sqlite/src/to_sqlite.rs b/crates/nu_plugin_to_sqlite/src/to_sqlite.rs index 1e400ab577..d9760feddc 100644 --- a/crates/nu_plugin_to_sqlite/src/to_sqlite.rs +++ b/crates/nu_plugin_to_sqlite/src/to_sqlite.rs @@ -47,7 +47,6 @@ fn nu_value_to_sqlite_string(v: Value) -> String { Primitive::Filesize(u) => format!("{}", u), Primitive::Pattern(s) => format!("'{}'", s.replace("'", "''")), Primitive::String(s) => format!("'{}'", s.replace("'", "''")), - Primitive::Line(s) => format!("'{}'", s.replace("'", "''")), Primitive::Boolean(true) => "1".into(), Primitive::Boolean(_) => "0".into(), Primitive::Date(d) => format!("'{}'", d),