Skip to content

Commit

Permalink
chore: update to Rust 1.74
Browse files Browse the repository at this point in the history
https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html

Changes in this commit:

* Update Nix flake, including nixpkgs and rust-overlay:

  - Rust 1.74
  - Node.js 21.1.0
  - wasm-bindgen 0.2.88
  - etc

* Bump `wasm-bindgen` dependency in `Cargo.toml` to match the new
  version of external `wasm-bindgen` binary installed on CI via Nix.
  Their versions must always match for the build to succeed.

* Fix the clippy warnings.
  • Loading branch information
aqrln committed Nov 17, 2023
1 parent 2ef5b74 commit b7f0918
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 53 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 12 additions & 35 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
crane = {
url = "github:ipetkov/crane";
inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay";
inputs.flake-utils.follows = "flake-utils";
};
flake-utils = {
url = "github:numtide/flake-utils";
Expand Down
2 changes: 1 addition & 1 deletion prisma-schema-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
wasm-bindgen = "=0.2.87"
wasm-bindgen = "=0.2.88"
wasm-logger = { version = "0.2.0", optional = true }
prisma-fmt = { path = "../prisma-fmt" }
2 changes: 1 addition & 1 deletion query-engine/black-box-tests/tests/metrics/smoke_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ mod smoke_tests {

fn assert_value_in_range(metrics: &str, metric: &str, low: f64, high: f64) {
let regex = Regex::new(format!(r"{metric}\s+([+-]?\d+(\.\d+)?)").as_str()).unwrap();
match regex.captures(&metrics) {
match regex.captures(metrics) {
Some(capture) => {
let value = capture.get(1).unwrap().as_str().parse::<f64>().unwrap();
assert!(
Expand Down
2 changes: 1 addition & 1 deletion query-engine/driver-adapters/src/proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ mod proxy_test {
let s = "13:02:20.321";
let json_value = serde_json::Value::String(s.to_string());
let quaint_value = js_value_to_quaint(json_value, column_type, "column_name").unwrap();
let time: NaiveTime = NaiveTime::from_hms_milli_opt(13, 02, 20, 321).unwrap();
let time: NaiveTime = NaiveTime::from_hms_milli_opt(13, 2, 20, 321).unwrap();
assert_eq!(quaint_value, QuaintValue::time(time));
}

Expand Down
2 changes: 1 addition & 1 deletion query-engine/query-engine-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serde_json.workspace = true
serde.workspace = true
tokio = { version = "1.25", features = ["macros", "sync", "io-util", "time"] }
futures = "0.3"
wasm-bindgen = "=0.2.87"
wasm-bindgen = "=0.2.88"
wasm-bindgen-futures = "0.4"
serde-wasm-bindgen = "0.5"
js-sys = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions schema-engine/sql-migration-tests/tests/native_types/mysql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -697,8 +697,8 @@ fn filter_from_types(api: &TestApi, cases: Cases) -> Cow<'static, [Case]> {
return Cow::Owned(
cases
.iter()
.filter(|&(ty, _, _)| !type_is_unsupported_mariadb(ty))
.cloned()
.filter(|(ty, _, _)| !type_is_unsupported_mariadb(ty))
.collect(),
);
}
Expand All @@ -707,8 +707,8 @@ fn filter_from_types(api: &TestApi, cases: Cases) -> Cow<'static, [Case]> {
return Cow::Owned(
cases
.iter()
.filter(|&(ty, _, _)| !type_is_unsupported_mysql_5_6(ty))
.cloned()
.filter(|(ty, _, _)| !type_is_unsupported_mysql_5_6(ty))
.collect(),
);
}
Expand Down

0 comments on commit b7f0918

Please sign in to comment.