1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

encoding.csv: remove unnecessary IError() cast

This commit is contained in:
Alexander Medvednikov 2022-10-27 11:30:08 +03:00
parent c9934672c4
commit 098db89b85
2 changed files with 6 additions and 6 deletions

View File

@ -91,7 +91,7 @@ pub fn (mut r Reader) read() ![]string {
fn (mut r Reader) read_line() !string { fn (mut r Reader) read_line() !string {
// last record // last record
if r.row_pos == r.data.len { if r.row_pos == r.data.len {
return IError(&EndOfFileError{}) return &EndOfFileError{}
} }
le := if r.is_mac_pre_osx_le { '\r' } else { '\n' } le := if r.is_mac_pre_osx_le { '\r' } else { '\n' }
mut i := r.data.index_after(le, r.row_pos) mut i := r.data.index_after(le, r.row_pos)
@ -103,7 +103,7 @@ fn (mut r Reader) read_line() !string {
r.is_mac_pre_osx_le = true r.is_mac_pre_osx_le = true
} else { } else {
// no valid line endings found // no valid line endings found
return IError(&InvalidLineEndingError{}) return &InvalidLineEndingError{}
} }
} else { } else {
// No line ending on file // No line ending on file
@ -121,10 +121,10 @@ fn (mut r Reader) read_line() !string {
fn (mut r Reader) read_record() ![]string { fn (mut r Reader) read_record() ![]string {
if r.delimiter == r.comment { if r.delimiter == r.comment {
return IError(&CommentIsDelimiterError{}) return &CommentIsDelimiterError{}
} }
if !valid_delim(r.delimiter) { if !valid_delim(r.delimiter) {
return IError(&InvalidDelimiterError{}) return &InvalidDelimiterError{}
} }
mut need_read := true mut need_read := true
mut keep_raw := false mut keep_raw := false
@ -204,7 +204,7 @@ fn (mut r Reader) read_record() ![]string {
} }
} }
if i <= -1 && fields.len == 0 { if i <= -1 && fields.len == 0 {
return IError(&InvalidDelimiterError{}) return &InvalidDelimiterError{}
} }
} }
return fields return fields

View File

@ -10,7 +10,7 @@ mut:
fn (mut s StringReader) read(mut buf []u8) !int { fn (mut s StringReader) read(mut buf []u8) !int {
if s.place >= s.text.len { if s.place >= s.text.len {
return IError(io.Eof{}) return io.Eof{}
} }
max_bytes := 100 max_bytes := 100
end := if s.place + max_bytes >= s.text.len { s.text.len } else { s.place + max_bytes } end := if s.place + max_bytes >= s.text.len { s.text.len } else { s.place + max_bytes }