Skip to content

Commit 4fc5867

Browse files
Treehugger RobotGerrit Code Review
authored andcommitted
Merge "Update csv-core to 0.1.12" into main
2 parents 0d2f08f + 387eff2 commit 4fc5867

File tree

8 files changed

+58
-22
lines changed

8 files changed

+58
-22
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"package":null,"files":{".cargo-checksum.json":"442c08b5a241fffd25d51be7da02a1072f8a6817b441dd0c519793e1ec0d22d2","Android.bp":"46a2bf4326291202aa593a43d1b4f2e2d19ebf2748db00b97e34dc214d3bfe69","COPYING":"7e2095b6d17d2d524a553ce879990287b4ca5be12c3ab759139f32ed920bd01e","Cargo.toml":"13507b192b957b6a985153f1d894622f3dc6e24a6ffb89f45becf2a72eb16794","LICENSE":"e477ec620ffb08af8bae12ebe7771ec557bdf198ffd6015add93d41b75b64850","LICENSE-MIT":"e477ec620ffb08af8bae12ebe7771ec557bdf198ffd6015add93d41b75b64850","METADATA":"e1652a8d04730529a77caf98b0f3e182b10489d96e380900ca4a1b46bafdd9df","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"5b1c3d8e82e688e1d20ef33eda5307d5ed65e67e181507a784241bafee325b05","TEST_MAPPING":"5df47f5b5b7533d10aa6a3ecb9189615e716a8060f002faa2bf4c893c12f33f9","UNLICENSE":"967829e00fe60415a970e1672710f7f3b3ef4db1e08cd00e921961a829e51c09","benches/bench.rs":"b4d9413ae4c360d8ec0898395c47acbe5713ff28dbcc5f7cd72329bbf65fca6b","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","src/lib.rs":"be68790ada9bff5a1f9f3e756bfae95c0050cf52c89ef3d8da44820dbc8c6227","src/reader.rs":"9b68c534f1e4d6667a9fcce3ba8f3f1b66faa8f6d505ce06bfea71ec53fcb5e4","src/writer.rs":"53d9d6104f7f821ca1238881d50739650c4be7ec45642d49095665368850b6af"}}
1+
{"package":null,"files":{".cargo-checksum.json":"9d59296955174857206952be5a9931000a6d428ae7f3b722031f7774a308f050","Android.bp":"7d395c0f12d774b2a48393ecca101c396e4b3a90c5d279ab505a97cc8dba8ba7","COPYING":"7e2095b6d17d2d524a553ce879990287b4ca5be12c3ab759139f32ed920bd01e","Cargo.toml":"a7075b51a6801ae5dbc77d4b182346f66dcfa40b1529b557faa2f449ed1211b6","LICENSE":"e477ec620ffb08af8bae12ebe7771ec557bdf198ffd6015add93d41b75b64850","LICENSE-MIT":"e477ec620ffb08af8bae12ebe7771ec557bdf198ffd6015add93d41b75b64850","METADATA":"143b9386640086bf695b6d0628a010383b82a2146bf576c115d4f72a3976028b","MODULE_LICENSE_MIT":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"5b1c3d8e82e688e1d20ef33eda5307d5ed65e67e181507a784241bafee325b05","TEST_MAPPING":"5df47f5b5b7533d10aa6a3ecb9189615e716a8060f002faa2bf4c893c12f33f9","UNLICENSE":"967829e00fe60415a970e1672710f7f3b3ef4db1e08cd00e921961a829e51c09","benches/bench.rs":"b4d9413ae4c360d8ec0898395c47acbe5713ff28dbcc5f7cd72329bbf65fca6b","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","src/lib.rs":"be68790ada9bff5a1f9f3e756bfae95c0050cf52c89ef3d8da44820dbc8c6227","src/reader.rs":"5ec3ab97f990236d8dd98e7e2eb5f1a4fe3bb8c6022faceb48346459d7602a00","src/writer.rs":"53d9d6104f7f821ca1238881d50739650c4be7ec45642d49095665368850b6af"}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"27c614bf8f212967d9386fc456b520ef8f01f0d12e56590d1fb487f294b0629e","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"a825a649e366e6e18a59a6fa038f698b3535025d1949f18966b84e3971628030","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","benches/bench.rs":"f25bc1dabf5f7fa4b89b6b5f444313346ef883c0d56ead2f50ba8301422305dc","src/lib.rs":"224853f79ad18353e3265d6f7ace00f1fb0b352b817555f122f60cdb57bb016a","src/reader.rs":"f18f9b1f2a2393597c7a7a7286876f751b351b78335dd7a46bde1ab3e3525474","src/writer.rs":"bd1b2f93c4b561773a21238cfd3a9ac54a14fd2e76182cc23206d74cecb4ba7a"},"package":"5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"}
1+
{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"814d768e4682efe5cbde1dec38a04c67ad7da7e0c14b377e0b1e8857b0ce3eea","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"a825a649e366e6e18a59a6fa038f698b3535025d1949f18966b84e3971628030","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","benches/bench.rs":"f25bc1dabf5f7fa4b89b6b5f444313346ef883c0d56ead2f50ba8301422305dc","src/lib.rs":"224853f79ad18353e3265d6f7ace00f1fb0b352b817555f122f60cdb57bb016a","src/reader.rs":"ea9c2741bb3b6c9e18f2007bc47aa31aa6945c558eaac41f51d0d69dfa40cf66","src/writer.rs":"bd1b2f93c4b561773a21238cfd3a9ac54a14fd2e76182cc23206d74cecb4ba7a"},"package":"7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d"}

crates/csv-core/Android.bp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rust_library {
1818
host_supported: true,
1919
crate_name: "csv_core",
2020
cargo_env_compat: true,
21-
cargo_pkg_version: "0.1.11",
21+
cargo_pkg_version: "0.1.12",
2222
crate_root: "src/lib.rs",
2323
edition: "2018",
2424
features: ["default"],

crates/csv-core/Cargo.toml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,14 @@
1212
[package]
1313
edition = "2018"
1414
name = "csv-core"
15-
version = "0.1.11"
15+
version = "0.1.12"
1616
authors = ["Andrew Gallant <[email protected]>"]
17+
build = false
18+
autolib = false
19+
autobins = false
20+
autoexamples = false
21+
autotests = false
22+
autobenches = false
1723
description = "Bare bones CSV parsing with no_std support."
1824
homepage = "https://github.com/BurntSushi/rust-csv"
1925
documentation = "https://docs.rs/csv-core"
@@ -34,23 +40,29 @@ license = "Unlicense/MIT"
3440
repository = "https://github.com/BurntSushi/rust-csv"
3541
resolver = "2"
3642

43+
[badges.appveyor]
44+
repository = "BurntSushi/rust-csv"
45+
46+
[badges.travis-ci]
47+
repository = "BurntSushi/rust-csv"
48+
49+
[features]
50+
default = []
51+
libc = ["memchr/libc"]
52+
3753
[lib]
54+
name = "csv_core"
55+
path = "src/lib.rs"
3856
bench = false
3957

58+
[[bench]]
59+
name = "bench"
60+
path = "benches/bench.rs"
61+
4062
[dependencies.memchr]
4163
version = "2"
4264
default-features = false
4365

4466
[dev-dependencies.arrayvec]
4567
version = "0.5"
4668
default-features = false
47-
48-
[features]
49-
default = []
50-
libc = ["memchr/libc"]
51-
52-
[badges.appveyor]
53-
repository = "BurntSushi/rust-csv"
54-
55-
[badges.travis-ci]
56-
repository = "BurntSushi/rust-csv"

crates/csv-core/METADATA

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
name: "csv-core"
22
description: "Bare bones CSV parsing with no_std support."
33
third_party {
4-
version: "0.1.11"
4+
version: "0.1.12"
55
license_type: NOTICE
66
last_upgrade_date {
7-
year: 2024
7+
year: 2025
88
month: 2
9-
day: 1
9+
day: 18
1010
}
1111
homepage: "https://crates.io/crates/csv-core"
1212
identifier {
1313
type: "Archive"
14-
value: "https://static.crates.io/crates/csv-core/csv-core-0.1.11.crate"
15-
version: "0.1.11"
14+
value: "https://static.crates.io/crates/csv-core/csv-core-0.1.12.crate"
15+
version: "0.1.12"
1616
}
1717
}

crates/csv-core/src/reader.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@ impl Reader {
487487
self.nfa_state = NfaState::StartRecord;
488488
self.line = 1;
489489
self.has_read = false;
490+
self.output_pos = 0;
490491
}
491492

492493
/// Return the current line number as measured by the number of occurrences
@@ -2002,4 +2003,27 @@ mod tests {
20022003

20032004
assert_read_record!(rdr, &inp, out, ends, 0, 0, 0, End);
20042005
}
2006+
2007+
#[test]
2008+
fn reset_input_partial() {
2009+
use crate::ReadRecordResult::*;
2010+
2011+
let inp = b("foo,bar\nbaz");
2012+
let out = &mut [0; 1024];
2013+
let ends = &mut [0; 10];
2014+
let mut rdr = Reader::new();
2015+
2016+
assert_read_record!(rdr, &inp, out, ends, 8, 6, 2, Record);
2017+
2018+
// Try to read incomplete record.
2019+
let (result, _, _, _) = rdr.read_record(&inp[8..], out, ends);
2020+
assert_eq!(result, InputEmpty);
2021+
2022+
rdr.reset();
2023+
2024+
let inp = b("baz,raz\n");
2025+
let (result, _, _, _) = rdr.read_record(inp, out, ends);
2026+
assert_eq!(result, Record);
2027+
assert_eq!(ends[0], 3);
2028+
}
20052029
}

pseudo_crate/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pseudo_crate/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ crossbeam-epoch = "=0.9.18"
8080
crossbeam-queue = "=0.3.12"
8181
crossbeam-utils = "=0.8.21"
8282
csv = "=1.3.1"
83-
csv-core = "=0.1.11"
83+
csv-core = "=0.1.12"
8484
darling = "0.20.10"
8585
darling_core = "=0.20.10"
8686
darling_macro = "=0.20.10"

0 commit comments

Comments
 (0)