holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "deprecate --format and --list in into datetime (#10017)" (#10055)

Browse Source 
related to 
-
https://github.com/nushell/nushell/issues/10017#issuecomment-1683082039

# Description
this PR undeprecates `into datetime --format` and `into datetime
--list`.

this PR reverts commit f33b60c001.

# User-Facing Changes

# Tests + Formatting

# After Submitting
This commit is contained in:
Antoine Stevan 2023-08-19 21:34:16 +02:00 committed by GitHub
parent 318862aad6
commit 028a327ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/nu-command/src/conversions/into/datetime.rs
View File

@ -5,7 +5,6 @@ use nu_engine::CallExt;
use nu_protocol::ast::Call; use nu_protocol::ast::Call;
use nu_protocol::ast::CellPath; use nu_protocol::ast::CellPath;
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::report_error_new;
use nu_protocol::{ use nu_protocol::{
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Spanned, Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Spanned,
SyntaxShape, Type, Value, SyntaxShape, Type, Value,
@ -88,12 +87,12 @@ impl Command for SubCommand {
.named( .named(
"format", "format",
SyntaxShape::String, SyntaxShape::String,
"DEPRECATED option, will be removed in 0.85: see `format date`", "Specify expected format of string input to parse to datetime. Use --list to see options",
Some('f'), Some('f'),
) )
.switch( .switch(
"list", "list",
"DEPRECATED option, will be removed in 0.85: see `format date --list`", "Show all possible variables for use in --format flag",
Some('l'), Some('l'),
) )
.rest( .rest(
@ -112,17 +111,6 @@ impl Command for SubCommand {
input: PipelineData, input: PipelineData,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
if call.has_flag("list") { if call.has_flag("list") {
report_error_new(
engine_state,
&ShellError::GenericError(
"Deprecated option".into(),
"`into datetime --list` is deprecated and will be removed in 0.85".into(),
Some(call.head),
Some("see `format datetime --list` instead".into()),
vec![],
),
);
Ok(generate_strftime_list(call.head, true).into_pipeline_data()) Ok(generate_strftime_list(call.head, true).into_pipeline_data())
} else { } else {
let cell_paths = call.rest(engine_state, stack, 0)?; let cell_paths = call.rest(engine_state, stack, 0)?;
@ -142,19 +130,6 @@ impl Command for SubCommand {
}), }),
}; };
if call.has_flag("format") {
report_error_new(
engine_state,
&ShellError::GenericError(
"Deprecated option".into(),
"`into datetime --format` is deprecated and will be removed in 0.85".into(),
Some(call.head),
Some("see `format datetime` instead".into()),
vec![],
),
);
}
let format_options = call let format_options = call
.get_flag::<String>(engine_state, stack, "format")? .get_flag::<String>(engine_state, stack, "format")?
.as_ref() .as_ref()
@ -199,7 +174,7 @@ impl Command for SubCommand {
}, },
Example { Example {
description: description:
"Convert non-standard timestamp string to datetime using a custom format (DEPRECATED: will be removed in 0.85)", "Convert non-standard timestamp string to datetime using a custom format",
example: "'20210227_135540+0000' | into datetime -f '%Y%m%d_%H%M%S%z'", example: "'20210227_135540+0000' | into datetime -f '%Y%m%d_%H%M%S%z'",
#[allow(clippy::inconsistent_digit_grouping)] #[allow(clippy::inconsistent_digit_grouping)]
result: example_result_1(1614434140_000000000), result: example_result_1(1614434140_000000000),