Remove Span::unknown (#525)

This commit is contained in:
JT
2021-12-19 18:46:13 +11:00
committed by GitHub
parent b54e9b6bfd
commit 2883d6cd1e
183 changed files with 1291 additions and 1124 deletions

View File

@ -99,7 +99,7 @@ impl Command for For {
}
fn examples(&self) -> Vec<Example> {
let span = Span::unknown();
let span = Span::test_data();
vec![
Example {
description: "Echo the square of each integer",
@ -110,7 +110,7 @@ impl Command for For {
Value::Int { val: 4, span },
Value::Int { val: 9, span },
],
span: Span::unknown(),
span,
}),
},
Example {
@ -122,7 +122,7 @@ impl Command for For {
Value::Int { val: 2, span },
Value::Int { val: 3, span },
],
span: Span::unknown(),
span,
}),
},
// FIXME? Numbered `for` is kinda strange, but was supported in previous nushell
@ -140,7 +140,7 @@ impl Command for For {
// span,
// },
// ],
// span: Span::unknown(),
// span,
// }),
// },
]

View File

@ -1,7 +1,7 @@
use nu_engine::eval_block;
use nu_protocol::ast::{Call, Expr, Expression, ImportPatternMember};
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Category, PipelineData, ShellError, Signature, Span, SyntaxShape};
use nu_protocol::{Category, PipelineData, ShellError, Signature, SyntaxShape};
#[derive(Clone)]
pub struct Use;
@ -89,7 +89,7 @@ impl Command for Use {
// TODO: Add string conversions (e.g. int to string)
// TODO: Later expand env to take all Values
let val = eval_block(engine_state, stack, block, PipelineData::new(call.head))?
.into_value(Span::unknown());
.into_value(call.head);
stack.add_env_var(name, val);
}

View File

@ -1,7 +1,7 @@
use indexmap::IndexMap;
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Value};
use nu_protocol::{Example, IntoPipelineData, PipelineData, ShellError, Signature, Value};
pub mod shadow {
include!(concat!(env!("OUT_DIR"), "/shadow.rs"));
@ -66,7 +66,7 @@ pub fn version(
"branch".to_string(),
Value::String {
val: branch.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -77,7 +77,7 @@ pub fn version(
"short_commit".to_string(),
Value::String {
val: short_commit.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -87,7 +87,7 @@ pub fn version(
"commit_hash".to_string(),
Value::String {
val: commit_hash.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -97,7 +97,7 @@ pub fn version(
"commit_date".to_string(),
Value::String {
val: commit_date.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -108,7 +108,7 @@ pub fn version(
"build_os".to_string(),
Value::String {
val: build_os.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -119,7 +119,7 @@ pub fn version(
"rust_version".to_string(),
Value::String {
val: rust_version.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -130,7 +130,7 @@ pub fn version(
"rust_channel".to_string(),
Value::String {
val: rust_channel.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -141,7 +141,7 @@ pub fn version(
"cargo_version".to_string(),
Value::String {
val: cargo_version.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -152,7 +152,7 @@ pub fn version(
"pkg_version".to_string(),
Value::String {
val: pkg_version.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -163,7 +163,7 @@ pub fn version(
"build_time".to_string(),
Value::String {
val: build_time.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -175,7 +175,7 @@ pub fn version(
"build_rust_channel".to_string(),
Value::String {
val: build_rust_channel.to_string(),
span: Span::unknown(),
span: call.head,
},
);
}
@ -184,7 +184,7 @@ pub fn version(
"features".to_string(),
Value::String {
val: features_enabled().join(", "),
span: Span::unknown(),
span: call.head,
},
);
@ -200,7 +200,7 @@ pub fn version(
"installed_plugins".to_string(),
Value::String {
val: installed_plugins.join(", "),
span: Span::unknown(),
span: call.head,
},
);
@ -211,9 +211,9 @@ pub fn version(
// vals: vec![Value::Record {
// cols,
// vals,
// span: Span::unknown(),
// span: call.head,
// }],
// span: Span::unknown(),
// span: call.head,
// }
// .into_pipeline_data())
@ -221,7 +221,7 @@ pub fn version(
Ok(Value::Record {
cols,
vals,
span: Span::unknown(),
span: call.head,
}
.into_pipeline_data())
}