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

Describe object now matches cmd name (#2603)

Browse Source
This commit is contained in:
Chris Gillespie 2020-09-26 18:54:47 -07:00 committed by GitHub
parent ed243c88d2
commit 18909ec14a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-cli/src/cli.rs
View File

@ -95,7 +95,7 @@ pub fn create_default_context(interactive: bool) -> Result<EvaluationContext, Bo
whole_stream_command(Kill), whole_stream_command(Kill),
whole_stream_command(Version), whole_stream_command(Version),
whole_stream_command(Clear), whole_stream_command(Clear),
whole_stream_command(What), whole_stream_command(Describe),
whole_stream_command(Which), whole_stream_command(Which),
whole_stream_command(Debug), whole_stream_command(Debug),
whole_stream_command(Alias), whole_stream_command(Alias),

4
crates/nu-cli/src/commands.rs
View File

@ -29,6 +29,7 @@ pub(crate) mod cp;
pub(crate) mod date; pub(crate) mod date;
pub(crate) mod debug; pub(crate) mod debug;
pub(crate) mod default; pub(crate) mod default;
pub(crate) mod describe;
pub(crate) mod do_; pub(crate) mod do_;
pub(crate) mod drop; pub(crate) mod drop;
pub(crate) mod du; pub(crate) mod du;
@ -120,7 +121,6 @@ pub(crate) mod uniq;
pub(crate) mod update; pub(crate) mod update;
pub(crate) mod url_; pub(crate) mod url_;
pub(crate) mod version; pub(crate) mod version;
pub(crate) mod what;
pub(crate) mod where_; pub(crate) mod where_;
pub(crate) mod which_; pub(crate) mod which_;
pub(crate) mod with_env; pub(crate) mod with_env;
@ -151,6 +151,7 @@ pub(crate) use cp::Cpy;
pub(crate) use date::{Date, DateFormat, DateNow, DateUTC}; pub(crate) use date::{Date, DateFormat, DateNow, DateUTC};
pub(crate) use debug::Debug; pub(crate) use debug::Debug;
pub(crate) use default::Default; pub(crate) use default::Default;
pub(crate) use describe::Describe;
pub(crate) use do_::Do; pub(crate) use do_::Do;
pub(crate) use drop::Drop; pub(crate) use drop::Drop;
pub(crate) use du::Du; pub(crate) use du::Du;
@ -263,7 +264,6 @@ pub(crate) use touch::Touch;
pub(crate) use uniq::Uniq; pub(crate) use uniq::Uniq;
pub(crate) use url_::{UrlCommand, UrlHost, UrlPath, UrlQuery, UrlScheme}; pub(crate) use url_::{UrlCommand, UrlHost, UrlPath, UrlQuery, UrlScheme};
pub(crate) use version::Version; pub(crate) use version::Version;
pub(crate) use what::What;
pub(crate) use where_::Where; pub(crate) use where_::Where;
pub(crate) use which_::Which; pub(crate) use which_::Which;
pub(crate) use with_env::WithEnv; pub(crate) use with_env::WithEnv;

14
crates/nu-cli/src/commands/what.rs → crates/nu-cli/src/commands/describe.rs
View File

@ -4,13 +4,13 @@ use crate::prelude::*;
use nu_errors::ShellError; use nu_errors::ShellError;
use nu_protocol::{ReturnSuccess, Signature, UntaggedValue}; use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
pub struct What; pub struct Describe;
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct WhatArgs {} pub struct DescribeArgs {}
#[async_trait] #[async_trait]
impl WholeStreamCommand for What { impl WholeStreamCommand for Describe {
fn name(&self) -> &str { fn name(&self) -> &str {
"describe" "describe"
} }
@ -28,11 +28,11 @@ impl WholeStreamCommand for What {
args: CommandArgs, args: CommandArgs,
registry: &CommandRegistry, registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> { ) -> Result<OutputStream, ShellError> {
what(args, registry).await describe(args, registry).await
} }
} }
pub async fn what( pub async fn describe(
args: CommandArgs, args: CommandArgs,
_registry: &CommandRegistry, _registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> { ) -> Result<OutputStream, ShellError> {
@ -49,12 +49,12 @@ pub async fn what(
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::What; use super::Describe;
#[test] #[test]
fn examples_work_as_expected() { fn examples_work_as_expected() {
use crate::examples::test as test_examples; use crate::examples::test as test_examples;
test_examples(What {}) test_examples(Describe {})
} }
} }