extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 17:15:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove Span::unknown (#525)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/nu_plugin_inc/src/inc.rs
View File

@ -25,7 +25,7 @@ impl Inc {
Default::default()
}
fn apply(&self, input: &str) -> Value {
fn apply(&self, input: &str, head: Span) -> Value {
match &self.action {
Some(Action::SemVerAction(act_on)) => {
let mut ver = match semver::Version::parse(input) {
@ -33,7 +33,7 @@ impl Inc {
Err(_) => {
return Value::String {
val: input.to_string(),
span: Span::unknown(),
span: head,
}
}
};
@ -46,17 +46,17 @@ impl Inc {
Value::String {
val: ver.to_string(),
span: Span::unknown(),
span: head,
}
}
Some(Action::Default) | None => match input.parse::<u64>() {
Ok(v) => Value::String {
val: (v + 1).to_string(),
span: Span::unknown(),
span: head,
},
Err(_) => Value::String {
val: input.to_string(),
span: Span::unknown(),
span: head,
},
},
}
@ -88,7 +88,7 @@ impl Inc {
val: val + 1,
span: *span,
}),
Value::String { val, .. } => Ok(self.apply(val)),
Value::String { val, .. } => Ok(self.apply(val, head)),
x => {
let msg = x.as_string().map_err(|e| LabeledError {
label: "Unable to extract string".into(),
@ -122,33 +122,33 @@ mod tests {
fn major() {
let expected = Value::String {
val: "1.0.0".to_string(),
span: Span::unknown(),
span: Span::test_data(),
};
let mut inc = Inc::new();
inc.for_semver(SemVerAction::Major);
assert_eq!(inc.apply("0.1.3"), expected)
assert_eq!(inc.apply("0.1.3", Span::test_data()), expected)
}
#[test]
fn minor() {
let expected = Value::String {
val: "0.2.0".to_string(),
span: Span::unknown(),
span: Span::test_data(),
};
let mut inc = Inc::new();
inc.for_semver(SemVerAction::Minor);
assert_eq!(inc.apply("0.1.3"), expected)
assert_eq!(inc.apply("0.1.3", Span::test_data()), expected)
}
#[test]
fn patch() {
let expected = Value::String {
val: "0.1.4".to_string(),
span: Span::unknown(),
span: Span::test_data(),
};
let mut inc = Inc::new();
inc.for_semver(SemVerAction::Patch);
assert_eq!(inc.apply("0.1.3"), expected)
assert_eq!(inc.apply("0.1.3", Span::test_data()), expected)
}
}
}

6
crates/nu_plugin_inc/src/nu/mod.rs
View File

@ -1,7 +1,7 @@
use crate::inc::SemVerAction;
use crate::Inc;
use nu_plugin::{EvaluatedCall, LabeledError, Plugin};
use nu_protocol::{Signature, Span, Value};
use nu_protocol::{Signature, Value};
impl Plugin for Inc {
fn signature(&self) -> Vec<Signature> {
@ -31,9 +31,7 @@ impl Plugin for Inc {
input: &Value,
) -> Result<Value, LabeledError> {
if name != "inc" {
return Ok(Value::Nothing {
span: Span::unknown(),
});
return Ok(Value::Nothing { span: call.head });
}
if call.has_flag("major") {