fix: rust-nightly build errors

hanabi1224 · Dec 24, 2023 · c470d59 · c470d59
1 parent fed3798
commit c470d59
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/bench/algorithm/mandelbrot/9.rs b/bench/algorithm/mandelbrot/9.rs
@@ -9,7 +9,7 @@
 
 #![feature(portable_simd)]
 
-use std::simd::{f64x8, SimdFloat, StdFloat};
+use std::simd::{f64x8, prelude::*, StdFloat};
 
 const MAX_ITER: usize = 50;
 const VLEN: usize = 8;

diff --git a/bench/algorithm/nbody/3.rs b/bench/algorithm/nbody/3.rs
@@ -8,7 +8,7 @@
 #![feature(portable_simd)]
 
 use std::f64::consts::PI;
-use std::simd::{f64x4, SimdFloat};
+use std::simd::{f64x4, prelude::*};
 
 const SOLAR_MASS: f64 = 4.0 * PI * PI;
 const YEAR: f64 = 365.24;

diff --git a/bench/algorithm/spectral-norm/8-m.rs b/bench/algorithm/spectral-norm/8-m.rs
@@ -14,7 +14,7 @@
 
 use rayon::prelude::*;
 use std::ops::*;
-use std::simd::{Simd, SimdFloat};
+use std::simd::{Simd, prelude::*};
 
 const LANES: usize = 4;
 type IntType = i32;

diff --git a/bench/algorithm/spectral-norm/8.rs b/bench/algorithm/spectral-norm/8.rs
@@ -14,7 +14,7 @@
 #![feature(portable_simd)]
 
 use std::ops::*;
-use std::simd::{Simd, SimdFloat};
+use std::simd::{Simd, prelude::*};
 
 const LANES: usize = 4;
 type IntType = i32;

diff --git a/bench/include/kotlin-jvm/build.gradle.kts b/bench/include/kotlin-jvm/build.gradle.kts
@@ -29,10 +29,10 @@ application {
 dependencies {
     // implementation(kotlin("stdlib"))
     // implementation("org.slf4j:slf4j-api:1.7.36")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
-    implementation("org.jetbrains.kotlinx:atomicfu:0.20.2")
-    val ktor_version = "2.3.0"
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
+    implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
+    val ktor_version = "2.3.7"
     implementation("io.ktor:ktor-server-core:$ktor_version")
     // implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-cio:$ktor_version")

diff --git a/bench/include/rust-nightly/Cargo.toml b/bench/include/rust-nightly/Cargo.toml
@@ -9,7 +9,6 @@ default = []
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 anyhow = "1"
-generic-array = "0"
 lazy_static = "1"
 md5 = "0"
 num-traits = "0"

diff --git a/bench/include/rust/Cargo.toml b/bench/include/rust/Cargo.toml
@@ -44,17 +44,17 @@ serde = {version = "1", features = ["derive"]}
 serde_json = {version = "1", features = ["float_roundtrip", "preserve_order"]}
 static-rc = "0"
 
-async-channel = {version = "1", optional = true}
+async-channel = {version = "2", optional = true}
 async-executor = {version = "1", optional = true}
 async-std = {version = "1", optional = true}
 axum = {version = "0.6", optional = true, features = ["http1", "http2"]}
 axum-server = {version = "0.4", optional = true, features = ["tls-rustls"]}
 flume = {version = "0", optional = true}
-futures-lite = {version = "1", optional = true}
+futures-lite = {version = "2", optional = true}
 hyper = {version = "0.14", optional = true, default-features = false, features = ["client", "http1", "http2"]}
-hyper-rustls = {version = "0.23", optional = true, default-features = false, features = ["native-tokio", "http2"]}
-rustls = {version = "0.20", optional = true}
-tokio = {version = "1.22", optional = true}
+hyper-rustls = {version = "0.24", optional = true, default-features = false, features = ["native-tokio", "http2"]}
+rustls = {version = "0.21", optional = true, features = ["dangerous_configuration"]}
+tokio = {version = "1.35", optional = true}
 warp = {version = "0.3", optional = true, features = ["tls"]}
 
 [profile.release]