diff options
| author | Laurenz <laurmaedje@gmail.com> | 2021-08-13 12:21:14 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2021-08-13 14:33:58 +0200 |
| commit | 144f20882136ef81b79d77bd8a68f42b76c66676 (patch) | |
| tree | 7a452ab2a092f674d93cd994d80b88cc6808e540 /src/library/utility.rs | |
| parent | d002cdf451e1c6efbf7cd7f2303264526b6f8a92 (diff) | |
Add file information to spans
Diffstat (limited to 'src/library/utility.rs')
| -rw-r--r-- | src/library/utility.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/library/utility.rs b/src/library/utility.rs index 22bde3a1..20d10830 100644 --- a/src/library/utility.rs +++ b/src/library/utility.rs @@ -25,7 +25,7 @@ pub fn len(_: &mut EvalContext, args: &mut FuncArgs) -> TypResult<Value> { Value::Str(v) => Value::Int(v.len() as i64), Value::Array(v) => Value::Int(v.len()), Value::Dict(v) => Value::Int(v.len()), - _ => bail!(args.source, span, "expected string, array or dictionary"), + _ => bail!(span, "expected string, array or dictionary"), }) } @@ -35,7 +35,7 @@ pub fn rgb(_: &mut EvalContext, args: &mut FuncArgs) -> TypResult<Value> { if let Some(string) = args.eat::<Spanned<EcoString>>() { match RgbaColor::from_str(&string.v) { Ok(color) => color, - Err(_) => bail!(args.source, string.span, "invalid color"), + Err(_) => bail!(string.span, "invalid color"), } } else { let r = args.expect("red component")?; @@ -60,7 +60,7 @@ pub fn max(_: &mut EvalContext, args: &mut FuncArgs) -> TypResult<Value> { /// Find the minimum or maximum of a sequence of values. fn minmax(args: &mut FuncArgs, goal: Ordering) -> TypResult<Value> { - let &mut FuncArgs { source, span, .. } = args; + let span = args.span; let mut extremum = args.expect::<Value>("value")?; for value in args.all::<Value>() { @@ -71,7 +71,6 @@ fn minmax(args: &mut FuncArgs, goal: Ordering) -> TypResult<Value> { } } None => bail!( - source, span, "cannot compare {} with {}", extremum.type_name(), |
