Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed into_value_unknown from public api

Browse Source
This commit is contained in:
Tim 'Piepmatz' Hesse 2024-06-10 08:24:56 +02:00
parent 7e7bab68f8
commit 202cdf16fe
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/nu-protocol/src/value/into_value.rs
View File

@ -39,13 +39,6 @@ use crate::{Record, ShellError, Span, Value};
pub trait IntoValue: Sized {
/// Converts the given value to a [`Value`].
fn into_value(self, span: Span) -> Value;
/// Converts the given value to a [`Value`] with an unknown [`Span`].
///
/// Internally this simply calls [`Span::unknown`] for the `span`.
fn into_value_unknown(self) -> Value {
Self::into_value(self, Span::unknown())
}
}
// Primitive Types

40
crates/nu-protocol/src/value/test_derive.rs
View File

@ -1,4 +1,4 @@
use crate::{record, FromValue, IntoValue, Record, Value};
use crate::{record, FromValue, IntoValue, Record, Span, Value};
use std::collections::HashMap;
// Make nu_protocol available in this namespace, consumers of this crate will
@ -6,6 +6,16 @@ use std::collections::HashMap;
// The derive macro fully qualifies paths to "nu_protocol".
use crate as nu_protocol;
trait IntoTestValue {
fn into_test_value(self) -> Value;
}
impl<T> IntoTestValue for T where T: IntoValue {
fn into_test_value(self) -> Value {
self.into_value(Span::test_data())
}
}
#[derive(IntoValue, FromValue, Debug, PartialEq)]
struct NamedFieldsStruct<T>
where
@ -80,7 +90,7 @@ impl NamedFieldsStruct<u32> {
]),
"bool" => Value::test_bool(true),
"char" => Value::test_string('a'),
"f32" => Value::test_float(std::f32::consts::PI as f64),
"f32" => Value::test_float(std::f32::consts::PI.into()),
"f64" => Value::test_float(std::f64::consts::E),
"i8" => Value::test_int(127),
"i16" => Value::test_int(-32768),
@ -118,7 +128,7 @@ impl NamedFieldsStruct<u32> {
#[test]
fn named_fields_struct_into_value() {
let expected = NamedFieldsStruct::value();
let actual = NamedFieldsStruct::make().into_value_unknown();
let actual = NamedFieldsStruct::make().into_test_value();
assert_eq!(expected, actual);
}
@ -133,13 +143,13 @@ fn named_fields_struct_from_value() {
fn named_fields_struct_roundtrip() {
let expected = NamedFieldsStruct::make();
let actual =
NamedFieldsStruct::from_value(NamedFieldsStruct::make().into_value_unknown()).unwrap();
NamedFieldsStruct::from_value(NamedFieldsStruct::make().into_test_value()).unwrap();
assert_eq!(expected, actual);
let expected = NamedFieldsStruct::value();
let actual = NamedFieldsStruct::<u32>::from_value(NamedFieldsStruct::value())
.unwrap()
.into_value_unknown();
.into_test_value();
assert_eq!(expected, actual);
}
@ -180,7 +190,7 @@ impl UnnamedFieldsStruct<f64> {
#[test]
fn unnamed_fields_struct_into_value() {
let expected = UnnamedFieldsStruct::value();
let actual = UnnamedFieldsStruct::make().into_value_unknown();
let actual = UnnamedFieldsStruct::make().into_test_value();
assert_eq!(expected, actual);
}
@ -196,13 +206,13 @@ fn unnamed_fields_struct_from_value() {
fn unnamed_fields_struct_roundtrip() {
let expected = UnnamedFieldsStruct::make();
let actual =
UnnamedFieldsStruct::from_value(UnnamedFieldsStruct::make().into_value_unknown()).unwrap();
UnnamedFieldsStruct::from_value(UnnamedFieldsStruct::make().into_test_value()).unwrap();
assert_eq!(expected, actual);
let expected = UnnamedFieldsStruct::value();
let actual = UnnamedFieldsStruct::<f64>::from_value(UnnamedFieldsStruct::value())
.unwrap()
.into_value_unknown();
.into_test_value();
assert_eq!(expected, actual);
}
@ -227,7 +237,7 @@ struct UnitStruct;
#[test]
fn unit_struct_into_value() {
let expected = Value::test_nothing();
let actual = UnitStruct.into_value_unknown();
let actual = UnitStruct.into_test_value();
assert_eq!(expected, actual);
}
@ -241,13 +251,13 @@ fn unit_struct_from_value() {
#[test]
fn unit_struct_roundtrip() {
let expected = UnitStruct;
let actual = UnitStruct::from_value(UnitStruct.into_value_unknown()).unwrap();
let actual = UnitStruct::from_value(UnitStruct.into_test_value()).unwrap();
assert_eq!(expected, actual);
let expected = Value::test_nothing();
let actual = UnitStruct::from_value(Value::test_nothing())
.unwrap()
.into_value_unknown();
.into_test_value();
assert_eq!(expected, actual);
}
@ -275,7 +285,7 @@ impl Enum {
#[test]
fn enum_into_value() {
let expected = Enum::value();
let actual = Enum::make().into_value_unknown();
let actual = Enum::make().into_test_value();
assert_eq!(expected, actual);
}
@ -289,13 +299,13 @@ fn enum_from_value() {
#[test]
fn enum_roundtrip() {
let expected = Enum::make();
let actual = <[Enum; 3]>::from_value(Enum::make().into_value_unknown()).unwrap();
let actual = <[Enum; 3]>::from_value(Enum::make().into_test_value()).unwrap();
assert_eq!(expected, actual);
let expected = Enum::value();
let actual = <[Enum; 3]>::from_value(Enum::value())
.unwrap()
.into_value_unknown();
.into_test_value();
assert_eq!(expected, actual);
}
@ -344,7 +354,7 @@ macro_rules! enum_rename_all {
#[test]
fn enum_rename_all_into_value() {$({
let expected = $ident::value();
let actual = $ident::make().into_value_unknown();
let actual = $ident::make().into_test_value();
assert_eq!(expected, actual);
})*}