786ba3bf91
# Description This PR tights input/output type-checking a bit more. There are a lot of commands that don't have correct input/output types, so part of the effort is updating them. This PR now contains updates to commands that had wrong input/output signatures. It doesn't add examples for these new signatures, but that can be follow-up work. # User-Facing Changes BREAKING CHANGE BREAKING CHANGE This work enforces many more checks on pipeline type correctness than previous nushell versions. This strictness may uncover incompatibilities in existing scripts or shortcomings in the type information for internal commands. # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
104 lines
2.7 KiB
Rust
104 lines
2.7 KiB
Rust
use super::Pipeline;
|
|
use crate::{ast::PipelineElement, Signature, Span, Type, VarId};
|
|
use serde::{Deserialize, Serialize};
|
|
use std::ops::{Index, IndexMut};
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct Block {
|
|
pub signature: Box<Signature>,
|
|
pub pipelines: Vec<Pipeline>,
|
|
pub captures: Vec<VarId>,
|
|
pub redirect_env: bool,
|
|
pub span: Option<Span>, // None option encodes no span to avoid using test_span()
|
|
pub recursive: Option<bool>, // does the block call itself?
|
|
}
|
|
|
|
impl Block {
|
|
pub fn len(&self) -> usize {
|
|
self.pipelines.len()
|
|
}
|
|
|
|
pub fn is_empty(&self) -> bool {
|
|
self.pipelines.is_empty()
|
|
}
|
|
}
|
|
|
|
impl Index<usize> for Block {
|
|
type Output = Pipeline;
|
|
|
|
fn index(&self, index: usize) -> &Self::Output {
|
|
&self.pipelines[index]
|
|
}
|
|
}
|
|
|
|
impl IndexMut<usize> for Block {
|
|
fn index_mut(&mut self, index: usize) -> &mut Self::Output {
|
|
&mut self.pipelines[index]
|
|
}
|
|
}
|
|
|
|
impl Default for Block {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl Block {
|
|
pub fn new() -> Self {
|
|
Self {
|
|
signature: Box::new(Signature::new("")),
|
|
pipelines: vec![],
|
|
captures: vec![],
|
|
redirect_env: false,
|
|
span: None,
|
|
recursive: None,
|
|
}
|
|
}
|
|
|
|
pub fn new_with_capacity(capacity: usize) -> Self {
|
|
Self {
|
|
signature: Box::new(Signature::new("")),
|
|
pipelines: Vec::with_capacity(capacity),
|
|
captures: vec![],
|
|
redirect_env: false,
|
|
span: None,
|
|
recursive: None,
|
|
}
|
|
}
|
|
|
|
pub fn output_type(&self) -> Type {
|
|
if let Some(last) = self.pipelines.last() {
|
|
if let Some(last) = last.elements.last() {
|
|
match last {
|
|
PipelineElement::Expression(_, expr) => expr.ty.clone(),
|
|
PipelineElement::Redirection(_, _, _) => Type::Any,
|
|
PipelineElement::SeparateRedirection { .. } => Type::Any,
|
|
PipelineElement::SameTargetRedirection { .. } => Type::Any,
|
|
PipelineElement::And(_, expr) => expr.ty.clone(),
|
|
PipelineElement::Or(_, expr) => expr.ty.clone(),
|
|
}
|
|
} else {
|
|
Type::Nothing
|
|
}
|
|
} else {
|
|
Type::Nothing
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T> From<T> for Block
|
|
where
|
|
T: Iterator<Item = Pipeline>,
|
|
{
|
|
fn from(pipelines: T) -> Self {
|
|
Self {
|
|
signature: Box::new(Signature::new("")),
|
|
pipelines: pipelines.collect(),
|
|
captures: vec![],
|
|
redirect_env: false,
|
|
span: None,
|
|
recursive: None,
|
|
}
|
|
}
|
|
}
|