caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX "data.typ" test (#412)

Browse Source
This commit is contained in:
Marek Barvíř 2023-03-30 11:52:27 +02:00 committed by GitHub
parent 81c5568aec
commit 5aa2ba1490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/src/compute/data.rs
View File

@ -1,5 +1,3 @@
use std::fmt::Write;
use typst::diag::{format_xml_like_error, FileError}; use typst::diag::{format_xml_like_error, FileError};
use crate::prelude::*; use crate::prelude::*;
@ -76,9 +74,12 @@ pub fn csv(
let mut reader = builder.from_reader(data.as_slice()); let mut reader = builder.from_reader(data.as_slice());
let mut array = Array::new(); let mut array = Array::new();
for result in reader.records() { for (line, result) in reader.records().enumerate() {
let row = result.map_err(format_csv_error).at(span)?; // Original solution use line from error, but that is incorrect with has_headers set to false
let sub = row.iter().map(|field| Value::Str(field.into())).collect(); // See issue: https://github.com/BurntSushi/rust-csv/issues/184
let line = line + 1; // Counting lines from 1
let row = result.map_err(|err| format_csv_error(err, line)).at(span)?;
let sub = row.into_iter().map(|field| Value::Str(field.into())).collect();
array.push(Value::Array(sub)) array.push(Value::Array(sub))
} }
@ -112,17 +113,13 @@ impl Default for Delimiter {
} }
/// Format the user-facing CSV error message. /// Format the user-facing CSV error message.
fn format_csv_error(error: csv::Error) -> String { fn format_csv_error(error: csv::Error, line: usize) -> String {
match error.kind() { match error.kind() {
csv::ErrorKind::Utf8 { .. } => "file is not valid utf-8".into(), csv::ErrorKind::Utf8 { .. } => "file is not valid utf-8".into(),
csv::ErrorKind::UnequalLengths { pos, expected_len, len } => { csv::ErrorKind::UnequalLengths { expected_len, len, .. } => {
let mut msg = format!( format!(
"failed to parse csv file: found {len} instead of {expected_len} fields" "failed to parse csv file: found {len} instead of {expected_len} fields in line {line}"
); )
if let Some(pos) = pos {
write!(msg, " in line {}", pos.line()).unwrap();
}
msg
} }
_ => "failed to parse csv file".into(), _ => "failed to parse csv file".into(),
} }