Skip to content

Update rust dependencies to compile on current compiler #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update rust dependencies to compile on current compiler #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
693 changes: 400 additions & 293 deletions cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2,965 changes: 1,711 additions & 1,254 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/atlas/client/cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ crate-type = ["cdylib"]

[dependencies]
atlas-comms = { path = "../comms" }
js-sys = "0.3.64"
js-sys = "0.3.77"
log = "0.4.19"
rand = "0.8.5"
wasm-bindgen = "0.2.87"
wasm-bindgen-futures = "0.4.37"
wasm-bindgen = "0.2.100"
wasm-bindgen-futures = "0.4.45"

# https://rust-random.github.io/book/crates.html#wasm-support
[dependencies.getrandom]
Expand All @@ -32,7 +32,7 @@ features = [
]

[dependencies.web-sys]
version = "0.3.64"
version = "0.3.77"
features = [
"BroadcastChannel",
"console",
Expand All @@ -41,7 +41,7 @@ features = [
]

[dev-dependencies]
wasm-bindgen-test = "0.3.37"
wasm-bindgen-test = "0.3.50"

[features]
loggers = ["atlas-comms/loggers"]
Expand Down
10 changes: 5 additions & 5 deletions src/atlas/comms/cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ console_error_panic_hook = "0.1.7"
console_log = { version = "1.0.0", optional = true }
fern = { version = "0.6.2", optional = true }
humantime = {version = "2.1.0", optional = true }
js-sys = "0.3.64"
js-sys = "0.3.77"
log = "0.4.19"
serde = "1.0.167"
serde-wasm-bindgen = "0.5.0"
wasm-bindgen = "0.2.87"
wasm-bindgen-futures = "0.4.37"
wasm-bindgen = "0.2.100"
wasm-bindgen-futures = "0.4.45"

[dependencies.tokio]
version = "1.28.2"
Expand All @@ -28,7 +28,7 @@ features = [
]

[dependencies.web-sys]
version = "0.3.64"
version = "0.3.77"
features = [
"console",
"DedicatedWorkerGlobalScope",
Expand All @@ -39,7 +39,7 @@ features = [
]

[dev-dependencies]
wasm-bindgen-test = "0.3.37"
wasm-bindgen-test = "0.3.50"

[features]
loggers = ["dep:console_log", "dep:fern", "dep:humantime"]
Expand Down
6 changes: 3 additions & 3 deletions src/atlas/comms/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub fn init_output() {

#[cfg(feature = "loggers")]
{
if let Err(_) = fern::Dispatch::new()
if let Err(e) = fern::Dispatch::new()
.format(|out, message, record| {
out.finish(format_args!(
"{} [{} {}:{}]",
Expand All @@ -37,7 +37,7 @@ pub fn init_output() {
.chain(fern::Output::call(console_log::log))
.apply()
{
web_sys::console::warn_1(&"Failed to initialize loggers.".into());
web_sys::console::warn_1(&format!("Failed to initialize loggers. {:?}", e).into());
}
}
}
Expand All @@ -50,7 +50,7 @@ mod tests {
use wasm_bindgen_test::*;
use web_sys::{OffscreenCanvas, Worker};

wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_worker);
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_dedicated_worker);

#[derive(Debug, PartialEq, Eq, Shareable)]
enum PlainEnum {
Expand Down
4 changes: 2 additions & 2 deletions src/atlas/graphics/cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ license-file = "../../../LICENSE"

[dependencies]
log = "0.4.19"
wgpu = "0.16.2"
wgpu = { version = "24.0.1", default-features = false, features = ["webgpu"] }

[dependencies.web-sys]
version = "0.3.64"
version = "0.3.77"
features = [
"OffscreenCanvas",
]
12 changes: 6 additions & 6 deletions src/atlas/graphics/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use log::trace;
use web_sys::OffscreenCanvas;
use wgpu::{Backends, Instance, InstanceDescriptor, RequestAdapterOptions};
use wgpu::{Backends, Instance, InstanceDescriptor, RequestAdapterOptions, SurfaceTarget};

pub async fn list_adapters(surface: OffscreenCanvas) {
let instance = Instance::new(InstanceDescriptor {
let instance = Instance::new(&InstanceDescriptor {
backends: Backends::BROWSER_WEBGPU,
dx12_shader_compiler: Default::default(),
flags: wgpu::InstanceFlags::from_build_config().with_env(),
..Default::default()
});

let surface = instance
.create_surface_from_offscreen_canvas(surface)
.expect("surface");
let target = SurfaceTarget::OffscreenCanvas(surface);
let surface = instance.create_surface(target).expect("surface");

let adapter = instance
.request_adapter(&RequestAdapterOptions {
Expand Down
10 changes: 5 additions & 5 deletions src/atlas/server/cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ crate-type = ["cdylib"]
atlas-comms = { path = "../comms" }
atlas-graphics = { path = "../graphics" }
console_error_panic_hook = "0.1.7"
js-sys = "0.3.64"
js-sys = "0.3.77"
log = "0.4.19"
rayon = "1.7.0"
wasm-bindgen = "0.2.87"
wasm-bindgen-futures = "0.4.37"
wasm-bindgen = "0.2.100"
wasm-bindgen-futures = "0.4.45"
wasm-bindgen-rayon = "1.0.3"

[dependencies.tokio]
Expand All @@ -28,13 +28,13 @@ features = [
]

[dependencies.web-sys]
version = "0.3.64"
version = "0.3.77"
features = [
"DedicatedWorkerGlobalScope",
]

[dev-dependencies]
wasm-bindgen-test = "0.3.37"
wasm-bindgen-test = "0.3.50"

[features]
loggers = ["atlas-comms/loggers"]
Expand Down