Switch back to nightly, update deps
This commit is contained in:
parent
1a5a628000
commit
e013fb427a
7 changed files with 57 additions and 28 deletions
|
|
@ -1,4 +1,4 @@
|
|||
[target.x86_64-unknown-linux-gnu]
|
||||
linker = "clang"
|
||||
# TODO: Share generics when using nightly no longer causes an undefined symbol error
|
||||
rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"] #, "-Zshare-generics=y"]
|
||||
rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold", "-Zshare-generics=y"]
|
||||
|
|
|
|||
18
.vscode/launch.json
vendored
18
.vscode/launch.json
vendored
|
|
@ -15,13 +15,13 @@
|
|||
"cwd": "${workspaceFolder}",
|
||||
"env": {
|
||||
"CARGO_MANIFEST_DIR": "${workspaceFolder}",
|
||||
"LD_LIBRARY_PATH": "${workspaceFolder}/target/debug/deps:${env:HOME}/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib"
|
||||
"LD_LIBRARY_PATH": "${workspaceFolder}/target/debug/deps:${env:HOME}/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib"
|
||||
},
|
||||
"presentation": {
|
||||
"hidden": false,
|
||||
"group": "run",
|
||||
"order": 1
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"type": "lldb",
|
||||
|
|
@ -34,13 +34,14 @@
|
|||
"cwd": "${workspaceFolder}",
|
||||
"env": {
|
||||
"CARGO_MANIFEST_DIR": "${workspaceFolder}",
|
||||
"LD_LIBRARY_PATH": "${workspaceFolder}/target/debug/deps:${env:HOME}/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib"
|
||||
"LD_LIBRARY_PATH": "${workspaceFolder}/target/debug/deps:${env:HOME}/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib"
|
||||
},
|
||||
"presentation": {
|
||||
"hidden": false,
|
||||
"group": "run",
|
||||
"order": 2
|
||||
}
|
||||
},
|
||||
"suppressMultipleSessionWarning": true,
|
||||
},
|
||||
{
|
||||
"type": "lldb",
|
||||
|
|
@ -53,13 +54,14 @@
|
|||
"cwd": "${workspaceFolder}",
|
||||
"env": {
|
||||
"CARGO_MANIFEST_DIR": "${workspaceFolder}",
|
||||
"LD_LIBRARY_PATH": "${workspaceFolder}/target/debug/deps:${env:HOME}/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib"
|
||||
"LD_LIBRARY_PATH": "${workspaceFolder}/target/debug/deps:${env:HOME}/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib"
|
||||
},
|
||||
"presentation": {
|
||||
"hidden": false,
|
||||
"group": "run",
|
||||
"order": 2
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"suppressMultipleSessionWarning": true,
|
||||
},
|
||||
],
|
||||
}
|
||||
|
|
|
|||
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
|
|
@ -15,6 +15,12 @@
|
|||
"RUSTFLAGS": "-Clinker=clang -Clink-arg=-fuse-ld=lld"
|
||||
},
|
||||
"rust-analyzer.check.command": "clippy", // "check", //
|
||||
// "rust-analyzer.check.overrideCommand": [
|
||||
// "bevy_lint",
|
||||
// "--workspace",
|
||||
// "--all-targets",
|
||||
// "--message-format=json-diagnostic-rendered-ansi",
|
||||
// ],
|
||||
"rust-analyzer.cargo.targetDir": true,
|
||||
"cSpell.words": [
|
||||
"Backquote",
|
||||
|
|
|
|||
26
Cargo.lock
generated
26
Cargo.lock
generated
|
|
@ -1623,9 +1623,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.39"
|
||||
version = "4.5.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f"
|
||||
checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
|
|
@ -1633,9 +1633,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.39"
|
||||
version = "4.5.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51"
|
||||
checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
|
|
@ -1645,9 +1645,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.32"
|
||||
version = "4.5.47"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
|
||||
checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
|
|
@ -1923,7 +1923,7 @@ dependencies = [
|
|||
"clap",
|
||||
"crossbeam-channel",
|
||||
"log",
|
||||
"rand 0.9.1",
|
||||
"rand 0.9.2",
|
||||
"uuid",
|
||||
"wyrand",
|
||||
]
|
||||
|
|
@ -2680,9 +2680,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.27"
|
||||
version = "0.4.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
|
||||
checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
|
||||
|
||||
[[package]]
|
||||
name = "malloc_buf"
|
||||
|
|
@ -3549,9 +3549,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.9.1"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
|
||||
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
|
||||
dependencies = [
|
||||
"rand_chacha 0.9.0",
|
||||
"rand_core 0.9.3",
|
||||
|
|
@ -4480,9 +4480,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "1.17.0"
|
||||
version = "1.18.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
|
||||
checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
|
||||
dependencies = [
|
||||
"getrandom 0.3.3",
|
||||
"js-sys",
|
||||
|
|
|
|||
28
Cargo.toml
28
Cargo.toml
|
|
@ -5,12 +5,32 @@ edition = "2024"
|
|||
description = "Experimental distributed physics system"
|
||||
license = "AGPL-3.0-only"
|
||||
|
||||
[lints.rust]
|
||||
# Mark `bevy_lint` as a valid `cfg`, as it is set when the Bevy linter runs.
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(bevy_lint)"] }
|
||||
|
||||
[lints.clippy]
|
||||
# Bevy supplies arguments to systems via dependency injection, so it's natural for systems to
|
||||
# request more than 7 arguments, which would undesirably trigger this lint.
|
||||
too_many_arguments = "allow"
|
||||
# Queries may access many components, which would undesirably trigger this lint.
|
||||
type_complexity = "allow"
|
||||
# Make sure macros use their standard braces, such as `[]` for `bevy_ecs::children!`.
|
||||
nonstandard_macro_braces = "warn"
|
||||
|
||||
[package.metadata.bevy_lint]
|
||||
panicking_methods = "deny"
|
||||
pedantic = "warn"
|
||||
|
||||
[profile.dev]
|
||||
opt-level = 1
|
||||
|
||||
[profile.dev.package."*"]
|
||||
opt-level = 3
|
||||
|
||||
[profile.dev.package.wgpu-types]
|
||||
debug-assertions = false
|
||||
|
||||
[profile.release]
|
||||
lto = true
|
||||
opt-level = 3
|
||||
|
|
@ -35,14 +55,14 @@ bevy = { version = "0.16.1", default-features = false, features = [
|
|||
"wayland",
|
||||
] }
|
||||
bevy_rand = { version = "0.11.0", features = ["wyrand", "std"] }
|
||||
clap = { version = "4.5.39", features = ["derive"] }
|
||||
clap = { version = "4.5.48", features = ["derive"] }
|
||||
crossbeam-channel = "0.5.15"
|
||||
log = { version = "0.4.27", features = ["release_max_level_warn"] }
|
||||
rand = { version = "0.9.1", default-features = false, features = [
|
||||
log = { version = "0.4.28", features = ["release_max_level_warn"] }
|
||||
rand = { version = "0.9.2", default-features = false, features = [
|
||||
"std",
|
||||
"thread_rng",
|
||||
] }
|
||||
uuid = { version = "1.17.0", features = ["v4"] }
|
||||
uuid = { version = "1.18.1", features = ["v4"] }
|
||||
wyrand = "0.3.2"
|
||||
|
||||
[features]
|
||||
|
|
|
|||
2
clippy.toml
Normal file
2
clippy.toml
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
# Require `bevy_ecs::children!` to use `[]` braces, instead of `()` or `{}`.
|
||||
standard-macro-braces = [{ name = "children", brace = "[" }]
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
[toolchain]
|
||||
# TODO: Switch back to nightly when it no longer causes an undefined symbol error
|
||||
channel = "stable" # "nightly"
|
||||
channel = "nightly"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue