Skip to content

Commit

Permalink
WIP: update flatbuffers, reqwest, yocalhost
Browse files Browse the repository at this point in the history
This is a WIP because it depends on pka/http-range-client#7
  • Loading branch information
michaelkirk committed Aug 12, 2024
1 parent 9348df1 commit 7a984b6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ default = ["http"]
http = ["http-range-client", "bytes", "reqwest"]

[dependencies]
flatbuffers = "23.5.26"
flatbuffers = "24.3.25"
byteorder = "1.5.0"
geozero = { version = "0.13.0", default-features = false }
http-range-client = { version = "0.7.2", optional = true, default-features = false, features = ["reqwest-async"] }
http-range-client = { version = "0.8.0", optional = true, default-features = false, features = ["reqwest-async"] }
bytes = { version = "1.5.0", optional = true }
log = "0.4.20"
fallible-streaming-iterator = "0.1.9"
tempfile = "3.8.1"
reqwest = { version = "0.11.22", optional = true }
reqwest = { version = "0.12.5", optional = true }

[dev-dependencies]
geozero = { version = "0.13.0", default-features = true }
Expand All @@ -34,9 +34,9 @@ hex = "0.4.3"
criterion = { version = "0.5.1", features = ["async_tokio"] }
tokio = { version = "1.34.0", features = ["rt-multi-thread"] }
# One test needs SSL support; just use the default system bindings for that.
reqwest = { version = "0.11.22", default-features = true }
reqwest = { version = "0.12.5", default-features = true }
geo-types = "0.7.12"
yocalhost = "0.3.0"
yocalhost = "0.5.0"
async-trait = "0.1.81"

[[bench]]
Expand Down
2 changes: 1 addition & 1 deletion src/rust/benches/http_read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let bytes_per_second = {
std::env::var("FGB_BENCH_BYTES_PER_SEC")
.map(|str| {
str.parse::<usize>()
str.parse::<u64>()
.expect("FGB_BENCH_BYTES_PER_SEC must be an integer")
})
.unwrap_or(50_000_000 / 8)
Expand Down
4 changes: 2 additions & 2 deletions src/rust/tests/http_read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ mod http {
let url = "https://wrong.example.com/countries.fgb";
let fgb = HttpFgbReader::open(url).await;
let error_text = fgb.err().unwrap().to_string();
let expected_error_text = "error trying to connect";
let expected_error_text = "error sending request";
assert!(
error_text.contains(expected_error_text),
"expected to find {expected_error_text} in {error_text}"
"expected to find '{expected_error_text}' in '{error_text}'"
);
}
}

0 comments on commit 7a984b6

Please sign in to comment.