2019-09-08 01:43:53 +02:00
|
|
|
use crate::prelude::*;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
|
|
|
use nu_protocol::{CallInfo, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
|
2019-09-08 01:43:53 +02:00
|
|
|
|
|
|
|
pub struct Echo;
|
|
|
|
|
|
|
|
impl PerItemCommand for Echo {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"echo"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2019-10-28 06:15:35 +01:00
|
|
|
Signature::build("echo").rest(SyntaxShape::Any, "the values to echo")
|
2019-09-08 01:43:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
2019-09-25 00:15:53 +02:00
|
|
|
"Echo the arguments back to the user."
|
2019-09-08 01:43:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
call_info: &CallInfo,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
raw_args: &RawCommandArgs,
|
2019-11-21 15:33:14 +01:00
|
|
|
_input: Value,
|
2019-09-08 01:43:53 +02:00
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
run(call_info, registry, raw_args)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
call_info: &CallInfo,
|
|
|
|
_registry: &CommandRegistry,
|
|
|
|
_raw_args: &RawCommandArgs,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
2019-11-01 20:15:53 +01:00
|
|
|
let mut output = vec![];
|
2019-09-08 01:43:53 +02:00
|
|
|
|
|
|
|
if let Some(ref positional) = call_info.args.positional {
|
|
|
|
for i in positional {
|
|
|
|
match i.as_string() {
|
|
|
|
Ok(s) => {
|
2019-11-01 20:15:53 +01:00
|
|
|
output.push(Ok(ReturnSuccess::Value(
|
2019-12-04 20:52:31 +01:00
|
|
|
UntaggedValue::string(s).into_value(i.tag.clone()),
|
2019-11-01 20:15:53 +01:00
|
|
|
)));
|
2019-09-08 01:43:53 +02:00
|
|
|
}
|
2019-11-01 20:15:53 +01:00
|
|
|
_ => match i {
|
2019-11-21 15:33:14 +01:00
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Table(table),
|
2019-11-01 20:15:53 +01:00
|
|
|
..
|
|
|
|
} => {
|
2019-11-21 15:33:14 +01:00
|
|
|
for value in table {
|
|
|
|
output.push(Ok(ReturnSuccess::Value(value.clone())));
|
2019-11-01 20:15:53 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
output.push(Ok(ReturnSuccess::Value(i.clone())));
|
|
|
|
}
|
|
|
|
},
|
2019-09-08 01:43:53 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Futures v0.3 upgrade (#1344)
* Upgrade futures, async-stream, and futures_codec
These were the last three dependencies on futures-preview. `nu` itself
is now fully dependent on `futures@0.3`, as opposed to `futures-preview`
alpha.
Because the update to `futures` from `0.3.0-alpha.19` to `0.3.0` removed
the `Stream` implementation of `VecDeque` ([changelog][changelog]), most
commands that convert a `VecDeque` to an `OutputStream` broke and had to
be fixed.
The current solution is to now convert `VecDeque`s to a `Stream` via
`futures::stream::iter`. However, it may be useful for `futures` to
create an `IntoStream` trait, implemented on the `std::collections` (or
really any `IntoIterator`). If something like this happends, it may be
worthwhile to update the trait implementations on `OutputStream` and
refactor these commands again.
While upgrading `futures_codec`, we remove a custom implementation of
`LinesCodec`, as one has been added to the library. There's also a small
refactor to make the stream output more idiomatic.
[changelog]: https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md#030---2019-11-5
* Upgrade sys & ps plugin dependencies
They were previously dependent on `futures-preview`, and `nu_plugin_ps`
was dependent on an old version of `futures-timer`.
* Remove dependency on futures-timer from nu
* Update Cargo.lock
* Fix formatting
* Revert fmt regressions
CI is still on 1.40.0, but the latest rustfmt v1.41.0 has changes to the
`val @ pattern` syntax, causing the linting job to fail.
* Fix clippy warnings
2020-02-06 04:46:48 +01:00
|
|
|
// TODO: This whole block can probably be replaced with `.map()`
|
|
|
|
let stream = futures::stream::iter(output);
|
2019-09-08 01:43:53 +02:00
|
|
|
|
|
|
|
Ok(stream.to_output_stream())
|
|
|
|
}
|