From 7c1487e18df108b54c74214adeea980fc4c32169 Mon Sep 17 00:00:00 2001 From: Stefan Holderbach Date: Tue, 3 Oct 2023 18:24:32 +0200 Subject: [PATCH] Use `int` type name consistently (#10579) # Description When referring to the type use `int` consistently. Only when referring to the concept of integer numbers use `integer`. - Fix `random integer` to `random int` tests - Forgot in #10520 - Use int instead of integer in error messages - Use int type name in bits commands - Fix messages in `for` examples - Use int typename in `into` commands - Use int typename in rest of commands - Report errors in `nu-protocol` with int typename Work for #10332 # User-Facing Changes User errorrs should now use `int` so you can easily find the necessary commands or type annotations. # Tests + Formatting Only two tests found that needed updating --- crates/nu-cli/src/commands/commandline.rs | 2 +- crates/nu-cmd-extra/src/extra/bits/and.rs | 10 ++----- crates/nu-cmd-extra/src/extra/bits/into.rs | 2 +- crates/nu-cmd-extra/src/extra/bits/not.rs | 2 +- crates/nu-cmd-extra/src/extra/bits/or.rs | 10 ++----- .../src/extra/bits/rotate_left.rs | 4 +-- .../src/extra/bits/rotate_right.rs | 4 +-- .../nu-cmd-extra/src/extra/bits/shift_left.rs | 4 +-- .../src/extra/bits/shift_right.rs | 4 +-- crates/nu-cmd-extra/src/extra/bits/xor.rs | 10 ++----- .../nu-cmd-extra/src/extra/conversions/fmt.rs | 2 +- crates/nu-cmd-lang/src/core_commands/for_.rs | 4 +-- .../nu-command/src/conversions/into/binary.rs | 5 ++-- .../nu-command/src/conversions/into/bool.rs | 4 +-- .../src/conversions/into/datetime.rs | 2 +- .../src/conversions/into/decimal.rs | 2 +- .../src/conversions/into/filesize.rs | 2 +- .../nu-command/src/conversions/into/float.rs | 2 +- crates/nu-command/src/conversions/into/int.rs | 30 +++++++++---------- .../nu-command/src/conversions/into/string.rs | 2 +- crates/nu-command/src/filters/append.rs | 8 ++--- crates/nu-command/src/filters/drop/nth.rs | 2 +- crates/nu-command/src/filters/prepend.rs | 6 ++-- crates/nu-command/src/filters/skip/skip_.rs | 6 ++-- crates/nu-command/src/formats/to/nuon.rs | 2 +- crates/nu-command/src/generators/seq_date.rs | 4 +-- crates/nu-command/src/math/utils.rs | 2 +- crates/nu-command/src/math/variance.rs | 3 +- crates/nu-command/src/network/http/client.rs | 2 +- crates/nu-command/src/network/url/join.rs | 4 +-- .../commands/random/{integer.rs => int.rs} | 6 ++-- .../nu-command/tests/commands/random/mod.rs | 2 +- crates/nu-command/tests/commands/url/join.rs | 4 +-- crates/nu-protocol/src/value/from_value.rs | 8 ++--- crates/nu-protocol/src/value/mod.rs | 2 +- src/tests/test_commandline.rs | 2 +- 36 files changed, 77 insertions(+), 93 deletions(-) rename crates/nu-command/tests/commands/random/{integer.rs => int.rs} (66%) diff --git a/crates/nu-cli/src/commands/commandline.rs b/crates/nu-cli/src/commands/commandline.rs index 1ab4282cb5..91083539b3 100644 --- a/crates/nu-cli/src/commands/commandline.rs +++ b/crates/nu-cli/src/commands/commandline.rs @@ -91,7 +91,7 @@ impl Command for Commandline { from_type: "string".to_string(), span: cmd.span(), help: Some(format!( - r#"string "{cmd_str}" does not represent a valid integer"# + r#"string "{cmd_str}" does not represent a valid int"# )), }) } diff --git a/crates/nu-cmd-extra/src/extra/bits/and.rs b/crates/nu-cmd-extra/src/extra/bits/and.rs index 8f1c9b91de..fdfb70d98d 100644 --- a/crates/nu-cmd-extra/src/extra/bits/and.rs +++ b/crates/nu-cmd-extra/src/extra/bits/and.rs @@ -22,16 +22,12 @@ impl Command for BitsAnd { Type::List(Box::new(Type::Int)), ), ]) - .required( - "target", - SyntaxShape::Int, - "target integer to perform bit and", - ) + .required("target", SyntaxShape::Int, "target int to perform bit and") .category(Category::Bits) } fn usage(&self) -> &str { - "Performs bitwise and for integers." + "Performs bitwise and for ints." } fn search_terms(&self) -> Vec<&str> { @@ -85,7 +81,7 @@ fn operate(value: Value, target: i64, head: Span) -> Value { Value::Error { .. } => value, other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer".into(), + exp_input_type: "int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/bits/into.rs b/crates/nu-cmd-extra/src/extra/bits/into.rs index 1699a05d2f..0e63dd85d9 100644 --- a/crates/nu-cmd-extra/src/extra/bits/into.rs +++ b/crates/nu-cmd-extra/src/extra/bits/into.rs @@ -219,7 +219,7 @@ pub fn action(input: &Value, _args: &Arguments, span: Span) -> Value { Value::Error { .. } => input.clone(), other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer, filesize, string, date, duration, binary or bool".into(), + exp_input_type: "int, filesize, string, date, duration, binary, or bool".into(), wrong_type: other.get_type().to_string(), dst_span: span, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/bits/not.rs b/crates/nu-cmd-extra/src/extra/bits/not.rs index 4c63fef730..2e50df6005 100644 --- a/crates/nu-cmd-extra/src/extra/bits/not.rs +++ b/crates/nu-cmd-extra/src/extra/bits/not.rs @@ -158,7 +158,7 @@ fn operate(value: Value, head: Span, signed: bool, number_size: NumberBytes) -> Value::Error { .. } => other, _ => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer".into(), + exp_input_type: "int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/bits/or.rs b/crates/nu-cmd-extra/src/extra/bits/or.rs index b89bd8ba6e..87dca7fb96 100644 --- a/crates/nu-cmd-extra/src/extra/bits/or.rs +++ b/crates/nu-cmd-extra/src/extra/bits/or.rs @@ -22,16 +22,12 @@ impl Command for BitsOr { Type::List(Box::new(Type::Int)), ), ]) - .required( - "target", - SyntaxShape::Int, - "target integer to perform bit or", - ) + .required("target", SyntaxShape::Int, "target int to perform bit or") .category(Category::Bits) } fn usage(&self) -> &str { - "Performs bitwise or for integers." + "Performs bitwise or for ints." } fn search_terms(&self) -> Vec<&str> { @@ -85,7 +81,7 @@ fn operate(value: Value, target: i64, head: Span) -> Value { Value::Error { .. } => value, other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer".into(), + exp_input_type: "int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs index e2a7259d9c..5eec68d46b 100644 --- a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs +++ b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs @@ -41,7 +41,7 @@ impl Command for BitsRol { } fn usage(&self) -> &str { - "Bitwise rotate left for integers." + "Bitwise rotate left for ints." } fn search_terms(&self) -> Vec<&str> { @@ -145,7 +145,7 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num Value::Error { .. } => value, other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer".into(), + exp_input_type: "int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs index 6af648519f..4bd44b1aeb 100644 --- a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs +++ b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs @@ -41,7 +41,7 @@ impl Command for BitsRor { } fn usage(&self) -> &str { - "Bitwise rotate right for integers." + "Bitwise rotate right for ints." } fn search_terms(&self) -> Vec<&str> { @@ -149,7 +149,7 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num Value::Error { .. } => value, other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer".into(), + exp_input_type: "int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs index f6feb61472..f7663ca855 100644 --- a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs +++ b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs @@ -41,7 +41,7 @@ impl Command for BitsShl { } fn usage(&self) -> &str { - "Bitwise shift left for integers." + "Bitwise shift left for ints." } fn search_terms(&self) -> Vec<&str> { @@ -169,7 +169,7 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num Value::Error { .. } => value, other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer".into(), + exp_input_type: "int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs index ff6f742757..f3bf66cf71 100644 --- a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs +++ b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs @@ -41,7 +41,7 @@ impl Command for BitsShr { } fn usage(&self) -> &str { - "Bitwise shift right for integers." + "Bitwise shift right for ints." } fn search_terms(&self) -> Vec<&str> { @@ -159,7 +159,7 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num Value::Error { .. } => value, other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer".into(), + exp_input_type: "int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/bits/xor.rs b/crates/nu-cmd-extra/src/extra/bits/xor.rs index a6ece2e652..a082b295e3 100644 --- a/crates/nu-cmd-extra/src/extra/bits/xor.rs +++ b/crates/nu-cmd-extra/src/extra/bits/xor.rs @@ -22,16 +22,12 @@ impl Command for BitsXor { Type::List(Box::new(Type::Int)), ), ]) - .required( - "target", - SyntaxShape::Int, - "target integer to perform bit xor", - ) + .required("target", SyntaxShape::Int, "target int to perform bit xor") .category(Category::Bits) } fn usage(&self) -> &str { - "Performs bitwise xor for integers." + "Performs bitwise xor for ints." } fn search_terms(&self) -> Vec<&str> { @@ -84,7 +80,7 @@ fn operate(value: Value, target: i64, head: Span) -> Value { Value::Error { .. } => value, other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer".into(), + exp_input_type: "int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs index 9b8b1171b5..b2e5fefed7 100644 --- a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs +++ b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs @@ -88,7 +88,7 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value { Value::Error { .. } => input.clone(), other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "float , integer or filesize".into(), + exp_input_type: "float, int, or filesize".into(), wrong_type: other.get_type().to_string(), dst_span: span, src_span: other.span(), diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs index 0c37c131cc..039eb30739 100644 --- a/crates/nu-cmd-lang/src/core_commands/for_.rs +++ b/crates/nu-cmd-lang/src/core_commands/for_.rs @@ -199,7 +199,7 @@ impl Command for For { fn examples(&self) -> Vec { vec![ Example { - description: "Echo the square of each integer", + description: "Print the square of each integer", example: "for x in [1 2 3] { print ($x * $x) }", result: None, }, @@ -209,7 +209,7 @@ impl Command for For { result: None, }, Example { - description: "Number each item and echo a message", + description: "Number each item and print a message", example: "for $it in ['bob' 'fred'] --numbered { print $\"($it.index) is ($it.item)\" }", result: None, diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs index f1197f5c51..b0437edc9c 100644 --- a/crates/nu-command/src/conversions/into/binary.rs +++ b/crates/nu-command/src/conversions/into/binary.rs @@ -115,8 +115,7 @@ impl Command for SubCommand { )), }, Example { - description: - "convert an integer to a nushell binary primitive with compact enabled", + description: "convert an int to a nushell binary primitive with compact enabled", example: "10 | into binary --compact", result: Some(Value::binary(vec![10], Span::test_data())), }, @@ -172,7 +171,7 @@ pub fn action(input: &Value, _args: &Arguments, span: Span) -> Value { Value::Error { .. } => input.clone(), other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer, float, filesize, string, date, duration, binary or bool" + exp_input_type: "int, float, filesize, string, date, duration, binary, or bool" .into(), wrong_type: other.get_type().to_string(), dst_span: span, diff --git a/crates/nu-command/src/conversions/into/bool.rs b/crates/nu-command/src/conversions/into/bool.rs index 95ec00a87f..89fbe032b3 100644 --- a/crates/nu-command/src/conversions/into/bool.rs +++ b/crates/nu-command/src/conversions/into/bool.rs @@ -90,7 +90,7 @@ impl Command for SubCommand { result: Some(Value::bool(true, span)), }, Example { - description: "convert integer to boolean", + description: "convert int to boolean", example: "1 | into bool", result: Some(Value::bool(true, span)), }, @@ -159,7 +159,7 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value { Value::Error { .. } => input.clone(), other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "bool, integer, float or string".into(), + exp_input_type: "bool, int, float or string".into(), wrong_type: other.get_type().to_string(), dst_span: span, src_span: other.span(), diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs index 8dd2506436..a6693b915e 100644 --- a/crates/nu-command/src/conversions/into/datetime.rs +++ b/crates/nu-command/src/conversions/into/datetime.rs @@ -256,7 +256,7 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value { other => { return Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "string and integer".into(), + exp_input_type: "string and int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-command/src/conversions/into/decimal.rs b/crates/nu-command/src/conversions/into/decimal.rs index 5c4e13d9e2..6ec420cff4 100644 --- a/crates/nu-command/src/conversions/into/decimal.rs +++ b/crates/nu-command/src/conversions/into/decimal.rs @@ -138,7 +138,7 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, head: Span) -> Value { Value::Error { .. } => input.clone(), other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "string, integer or bool".into(), + exp_input_type: "string, int, or bool".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-command/src/conversions/into/filesize.rs b/crates/nu-command/src/conversions/into/filesize.rs index 283f202dac..649404f95f 100644 --- a/crates/nu-command/src/conversions/into/filesize.rs +++ b/crates/nu-command/src/conversions/into/filesize.rs @@ -136,7 +136,7 @@ pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value { Value::Nothing { .. } => Value::filesize(0, value_span), other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "string and integer".into(), + exp_input_type: "string and int".into(), wrong_type: other.get_type().to_string(), dst_span: span, src_span: value_span, diff --git a/crates/nu-command/src/conversions/into/float.rs b/crates/nu-command/src/conversions/into/float.rs index 94eea96116..62149bf9cb 100644 --- a/crates/nu-command/src/conversions/into/float.rs +++ b/crates/nu-command/src/conversions/into/float.rs @@ -121,7 +121,7 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, head: Span) -> Value { Value::Error { .. } => input.clone(), other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "string, integer or bool".into(), + exp_input_type: "string, int or bool".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-command/src/conversions/into/int.rs b/crates/nu-command/src/conversions/into/int.rs index 8a48f301c5..4f8a51d2ea 100644 --- a/crates/nu-command/src/conversions/into/int.rs +++ b/crates/nu-command/src/conversions/into/int.rs @@ -158,32 +158,32 @@ impl Command for SubCommand { fn examples(&self) -> Vec { vec![ Example { - description: "Convert string to integer in table", + description: "Convert string to int in table", example: "[[num]; ['-5'] [4] [1.5]] | into int num", result: None, }, Example { - description: "Convert string to integer", + description: "Convert string to int", example: "'2' | into int", result: Some(Value::test_int(2)), }, Example { - description: "Convert float to integer", + description: "Convert float to int", example: "5.9 | into int", result: Some(Value::test_int(5)), }, Example { - description: "Convert decimal string to integer", + description: "Convert decimal string to int", example: "'5.9' | into int", result: Some(Value::test_int(5)), }, Example { - description: "Convert file size to integer", + description: "Convert file size to int", example: "4KB | into int", result: Some(Value::test_int(4000)), }, Example { - description: "Convert bool to integer", + description: "Convert bool to int", example: "[false, true] | into int", result: Some(Value::list( vec![Value::test_int(0), Value::test_int(1)], @@ -191,32 +191,32 @@ impl Command for SubCommand { )), }, Example { - description: "Convert date to integer (Unix nanosecond timestamp)", + description: "Convert date to int (Unix nanosecond timestamp)", example: "1983-04-13T12:09:14.123456789-05:00 | into int", result: Some(Value::test_int(419101754123456789)), }, Example { - description: "Convert to integer from binary", + description: "Convert to int from binary data (radix: 2)", example: "'1101' | into int -r 2", result: Some(Value::test_int(13)), }, Example { - description: "Convert to integer from hex", + description: "Convert to int from hex", example: "'FF' | into int -r 16", result: Some(Value::test_int(255)), }, Example { - description: "Convert octal string to integer", + description: "Convert octal string to int", example: "'0o10132' | into int", result: Some(Value::test_int(4186)), }, Example { - description: "Convert 0 padded string to integer", + description: "Convert 0 padded string to int", example: "'0010132' | into int", result: Some(Value::test_int(10132)), }, Example { - description: "Convert 0 padded string to integer with radix", + description: "Convert 0 padded string to int with radix 8", example: "'0010132' | into int -r 8", result: Some(Value::test_int(4186)), }, @@ -248,7 +248,7 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value { return Value::error( ShellError::CantConvert { to_type: "float".to_string(), - from_type: "integer".to_string(), + from_type: "int".to_string(), span, help: None, }, @@ -327,7 +327,7 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value { Value::Error { .. } => input.clone(), other => Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "integer, float, filesize, date, string, binary, duration or bool" + exp_input_type: "int, float, filesize, date, string, binary, duration, or bool" .into(), wrong_type: other.get_type().to_string(), dst_span: span, @@ -376,7 +376,7 @@ fn convert_int(input: &Value, head: Span, radix: u32) -> Value { other => { return Value::error( ShellError::OnlySupportsThisInputType { - exp_input_type: "string and integer".into(), + exp_input_type: "string and int".into(), wrong_type: other.get_type().to_string(), dst_span: head, src_span: other.span(), diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs index b3741515ce..09a07c9243 100644 --- a/crates/nu-command/src/conversions/into/string.rs +++ b/crates/nu-command/src/conversions/into/string.rs @@ -84,7 +84,7 @@ impl Command for SubCommand { fn examples(&self) -> Vec { vec![ Example { - description: "convert integer to string and append three decimal places", + description: "convert int to string and append three decimal places", example: "5 | into string -d 3", result: Some(Value::test_string("5.000")), }, diff --git a/crates/nu-command/src/filters/append.rs b/crates/nu-command/src/filters/append.rs index 6c95af55fe..0b84a846fa 100644 --- a/crates/nu-command/src/filters/append.rs +++ b/crates/nu-command/src/filters/append.rs @@ -41,7 +41,7 @@ only unwrap the outer list, and leave the variable's contents untouched."# vec![ Example { example: "[0 1 2 3] | append 4", - description: "Append one integer to a list", + description: "Append one int to a list", result: Some(Value::test_list(vec![ Value::test_int(0), Value::test_int(1), @@ -70,7 +70,7 @@ only unwrap the outer list, and leave the variable's contents untouched."# }, Example { example: "[0 1] | append [2 3 4]", - description: "Append three integer items", + description: "Append three int items", result: Some(Value::test_list(vec![ Value::test_int(0), Value::test_int(1), @@ -81,7 +81,7 @@ only unwrap the outer list, and leave the variable's contents untouched."# }, Example { example: "[0 1] | append [2 nu 4 shell]", - description: "Append integers and strings", + description: "Append ints and strings", result: Some(Value::test_list(vec![ Value::test_int(0), Value::test_int(1), @@ -93,7 +93,7 @@ only unwrap the outer list, and leave the variable's contents untouched."# }, Example { example: "[0 1] | append 2..4", - description: "Append a range of integers to a list", + description: "Append a range of ints to a list", result: Some(Value::test_list(vec![ Value::test_int(0), Value::test_int(1), diff --git a/crates/nu-command/src/filters/drop/nth.rs b/crates/nu-command/src/filters/drop/nth.rs index d6317cf115..d8a6387792 100644 --- a/crates/nu-command/src/filters/drop/nth.rs +++ b/crates/nu-command/src/filters/drop/nth.rs @@ -122,7 +122,7 @@ impl Command for DropNth { if from.is_negative() || to.is_negative() { let span: Spanned = call.req(engine_state, stack, 0)?; return Err(ShellError::TypeMismatch { - err_message: "drop nth accepts only positive integers".to_string(), + err_message: "drop nth accepts only positive ints".to_string(), span: span.span, }); } diff --git a/crates/nu-command/src/filters/prepend.rs b/crates/nu-command/src/filters/prepend.rs index e72bfc505f..4977827763 100644 --- a/crates/nu-command/src/filters/prepend.rs +++ b/crates/nu-command/src/filters/prepend.rs @@ -62,7 +62,7 @@ only unwrap the outer list, and leave the variable's contents untouched."# }, Example { example: "[1 2 3 4] | prepend 0", - description: "Prepend one integer item", + description: "Prepend one int item", result: Some(Value::test_list(vec![ Value::test_int(0), Value::test_int(1), @@ -73,7 +73,7 @@ only unwrap the outer list, and leave the variable's contents untouched."# }, Example { example: "[2 3 4] | prepend [0 1]", - description: "Prepend two integer items", + description: "Prepend two int items", result: Some(Value::test_list(vec![ Value::test_int(0), Value::test_int(1), @@ -84,7 +84,7 @@ only unwrap the outer list, and leave the variable's contents untouched."# }, Example { example: "[2 nu 4 shell] | prepend [0 1 rocks]", - description: "Prepend integers and strings", + description: "Prepend ints and strings", result: Some(Value::test_list(vec![ Value::test_int(0), Value::test_int(1), diff --git a/crates/nu-command/src/filters/skip/skip_.rs b/crates/nu-command/src/filters/skip/skip_.rs index 1ee192e73f..72370daf83 100644 --- a/crates/nu-command/src/filters/skip/skip_.rs +++ b/crates/nu-command/src/filters/skip/skip_.rs @@ -80,15 +80,13 @@ impl Command for Skip { match v { Value::Int { val, .. } => { val.try_into().map_err(|err| ShellError::TypeMismatch { - err_message: format!( - "Could not convert {val} to unsigned integer: {err}" - ), + err_message: format!("Could not convert {val} to unsigned int: {err}"), span, })? } _ => { return Err(ShellError::TypeMismatch { - err_message: "expected integer".into(), + err_message: "expected int".into(), span, }) } diff --git a/crates/nu-command/src/formats/to/nuon.rs b/crates/nu-command/src/formats/to/nuon.rs index bbbb197a40..bd09df211b 100644 --- a/crates/nu-command/src/formats/to/nuon.rs +++ b/crates/nu-command/src/formats/to/nuon.rs @@ -97,7 +97,7 @@ impl Command for ToNuon { result: Some(Value::test_string("[1, 2, 3]")) }, Example { - description: "Outputs a NUON array of integers, with pretty indentation", + description: "Outputs a NUON array of ints, with pretty indentation", example: "[1 2 3] | to nuon --indent 2", result: Some(Value::test_string("[\n 1,\n 2,\n 3\n]")), }, diff --git a/crates/nu-command/src/generators/seq_date.rs b/crates/nu-command/src/generators/seq_date.rs index 6f2df0d06f..e9a6976a6a 100644 --- a/crates/nu-command/src/generators/seq_date.rs +++ b/crates/nu-command/src/generators/seq_date.rs @@ -283,8 +283,8 @@ pub fn run_seq_dates( Some(date) => date, None => { return Err(ShellError::GenericError( - "integer value too large".to_string(), - "integer value too large".to_string(), + "int value too large".to_string(), + "int value too large".to_string(), Some(call_span), None, Vec::new(), diff --git a/crates/nu-command/src/math/utils.rs b/crates/nu-command/src/math/utils.rs index 9149183bde..0423689aa6 100644 --- a/crates/nu-command/src/math/utils.rs +++ b/crates/nu-command/src/math/utils.rs @@ -108,7 +108,7 @@ pub fn calculate( PipelineData::Value(val, ..) => mf(&[val], span, name), PipelineData::Empty { .. } => Err(ShellError::PipelineEmpty { dst_span: name }), val => Err(ShellError::UnsupportedInput( - "Only integers, floats, lists, records or ranges are supported".into(), + "Only ints, floats, lists, records, or ranges are supported".into(), "value originates from here".into(), name, // This requires both the ListStream and Empty match arms to be above it. diff --git a/crates/nu-command/src/math/variance.rs b/crates/nu-command/src/math/variance.rs index 3f470e7a82..702a687bde 100644 --- a/crates/nu-command/src/math/variance.rs +++ b/crates/nu-command/src/math/variance.rs @@ -66,8 +66,7 @@ fn sum_of_squares(values: &[Value], span: Span) -> Result { Value::Int { .. } | Value::Float { .. } => Ok(value), Value::Error { error, .. } => Err(*error.clone()), _ => Err(ShellError::UnsupportedInput( - "Attempted to compute the sum of squares of a non-integer, non-float value" - .to_string(), + "Attempted to compute the sum of squares of a non-int, non-float value".to_string(), "value originates from here".into(), span, value.span(), diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs index 1d0d455744..279b13e9d0 100644 --- a/crates/nu-command/src/network/http/client.rs +++ b/crates/nu-command/src/network/http/client.rs @@ -288,7 +288,7 @@ pub fn request_set_timeout( let val = timeout.as_i64()?; if val.is_negative() || val < 1 { return Err(ShellError::TypeMismatch { - err_message: "Timeout value must be an integer and larger than 0".to_string(), + err_message: "Timeout value must be an int and larger than 0".to_string(), span: timeout.span(), }); } diff --git a/crates/nu-command/src/network/url/join.rs b/crates/nu-command/src/network/url/join.rs index 44c2f955a9..fd0bc7568c 100644 --- a/crates/nu-command/src/network/url/join.rs +++ b/crates/nu-command/src/network/url/join.rs @@ -158,7 +158,7 @@ impl UrlComponents { }), Err(_) => Err(ShellError::IncompatibleParametersSingle { msg: String::from( - "Port parameter should represent an unsigned integer", + "Port parameter should represent an unsigned int", ), span: value_span, }), @@ -172,7 +172,7 @@ impl UrlComponents { Value::Error { error, .. } => Err(*error), other => Err(ShellError::IncompatibleParametersSingle { msg: String::from( - "Port parameter should be an unsigned integer or a string representing it", + "Port parameter should be an unsigned int or a string representing it", ), span: other.span(), }), diff --git a/crates/nu-command/tests/commands/random/integer.rs b/crates/nu-command/tests/commands/random/int.rs similarity index 66% rename from crates/nu-command/tests/commands/random/integer.rs rename to crates/nu-command/tests/commands/random/int.rs index 9bcb2df103..3fb3ee945e 100644 --- a/crates/nu-command/tests/commands/random/integer.rs +++ b/crates/nu-command/tests/commands/random/int.rs @@ -2,21 +2,21 @@ use nu_test_support::nu; #[test] fn generates_an_integer() { - let actual = nu!("random integer 42..43"); + let actual = nu!("random int 42..43"); assert!(actual.out.contains("42") || actual.out.contains("43")); } #[test] fn generates_55() { - let actual = nu!("random integer 55..55"); + let actual = nu!("random int 55..55"); assert!(actual.out.contains("55")); } #[test] fn generates_0() { - let actual = nu!("random integer ..<1"); + let actual = nu!("random int ..<1"); assert!(actual.out.contains('0')); } diff --git a/crates/nu-command/tests/commands/random/mod.rs b/crates/nu-command/tests/commands/random/mod.rs index c0dc226498..5a6b4c4b4a 100644 --- a/crates/nu-command/tests/commands/random/mod.rs +++ b/crates/nu-command/tests/commands/random/mod.rs @@ -2,6 +2,6 @@ mod bool; mod chars; mod dice; mod float; -mod integer; +mod int; #[cfg(feature = "uuid_crate")] mod uuid; diff --git a/crates/nu-command/tests/commands/url/join.rs b/crates/nu-command/tests/commands/url/join.rs index b0a2a0bba2..9fa5ab16fc 100644 --- a/crates/nu-command/tests/commands/url/join.rs +++ b/crates/nu-command/tests/commands/url/join.rs @@ -245,7 +245,7 @@ fn url_join_with_invalid_port() { assert!(actual .err - .contains("Port parameter should represent an unsigned integer")); + .contains("Port parameter should represent an unsigned int")); let actual = nu!(pipeline( r#" @@ -259,7 +259,7 @@ fn url_join_with_invalid_port() { assert!(actual .err - .contains("Port parameter should be an unsigned integer or a string representing it")); + .contains("Port parameter should be an unsigned int or a string representing it")); } #[test] diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs index aafbee8273..63c535ecd0 100644 --- a/crates/nu-protocol/src/value/from_value.rs +++ b/crates/nu-protocol/src/value/from_value.rs @@ -26,7 +26,7 @@ impl FromValue for Spanned { Value::Duration { val, .. } => Ok(Spanned { item: *val, span }), v => Err(ShellError::CantConvert { - to_type: "integer".into(), + to_type: "int".into(), from_type: v.get_type().to_string(), span: v.span(), help: None, @@ -43,7 +43,7 @@ impl FromValue for i64 { Value::Duration { val, .. } => Ok(*val), v => Err(ShellError::CantConvert { - to_type: "integer".into(), + to_type: "int".into(), from_type: v.get_type().to_string(), span: v.span(), help: None, @@ -123,7 +123,7 @@ impl FromValue for Spanned { } v => Err(ShellError::CantConvert { - to_type: "non-negative integer".into(), + to_type: "non-negative int".into(), from_type: v.get_type().to_string(), span: v.span(), help: None, @@ -159,7 +159,7 @@ impl FromValue for usize { } v => Err(ShellError::CantConvert { - to_type: "non-negative integer".into(), + to_type: "non-negative int".into(), from_type: v.get_type().to_string(), span: v.span(), help: None, diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs index 0cebaecb1b..fd85ce9cf4 100644 --- a/crates/nu-protocol/src/value/mod.rs +++ b/crates/nu-protocol/src/value/mod.rs @@ -255,7 +255,7 @@ impl Value { match self { Value::Int { val, .. } => Ok(*val), x => Err(ShellError::CantConvert { - to_type: "integer".into(), + to_type: "int".into(), from_type: x.get_type().to_string(), span: self.span(), help: None, diff --git a/src/tests/test_commandline.rs b/src/tests/test_commandline.rs index 03db3fa921..169dde11c9 100644 --- a/src/tests/test_commandline.rs +++ b/src/tests/test_commandline.rs @@ -124,6 +124,6 @@ fn commandline_test_cursor_invalid() -> TestResult { fail_test( "commandline --replace '123456'\n\ commandline --cursor 'abc'", - r#"string "abc" does not represent a valid integer"#, + r#"string "abc" does not represent a valid int"#, ) }