diff options
| author | EightFactorial <29801334+EightFactorial@users.noreply.github.com> | 2024-12-04 16:31:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 18:31:22 -0600 |
| commit | 6379035b852f1b619565d27f5cee3b93042c2312 (patch) | |
| tree | 30c858cfaf841d0fcc5a139f1507b9b67d768e8b /azalea-registry | |
| parent | 241c7527ce11177082dcc0ebc4152506946ee684 (diff) | |
| download | azalea-drasl-6379035b852f1b619565d27f5cee3b93042c2312.tar.xz | |
Update Bevy and migrate to workspace dependencies and package attributes (#181)
* Use workspace `Cargo.toml` for dependencies and package atributes
* Fix a couple clippy warnings
* Update bevy, update build script, move deps to workspace, and fix clippy warnings
* Remove carrots from crate versions
The default behavior is the same
* Remove unused dependencies
Compiles and all tests pass, so it should be fine
* Update codegen to use `std::sync::LazyLock` instead of `once_cell::sync::Lazy`
* Update Bevy to `0.15.0-rc.3`
Surprisingly little needed to be changed
* Update to bevy 0.15.0
* Fix leftover merge issues
* Clarify the reason the swarm can't connect
* Fix duplicate lint, remove `log` dependency
Diffstat (limited to 'azalea-registry')
| -rw-r--r-- | azalea-registry/Cargo.toml | 12 | ||||
| -rw-r--r-- | azalea-registry/azalea-registry-macros/Cargo.toml | 12 | ||||
| -rw-r--r-- | azalea-registry/src/tags/blocks.rs | 3 | ||||
| -rw-r--r-- | azalea-registry/src/tags/fluids.rs | 3 | ||||
| -rw-r--r-- | azalea-registry/src/tags/items.rs | 3 |
5 files changed, 13 insertions, 20 deletions
diff --git a/azalea-registry/Cargo.toml b/azalea-registry/Cargo.toml index 45d16c4a..32d08bbe 100644 --- a/azalea-registry/Cargo.toml +++ b/azalea-registry/Cargo.toml @@ -1,12 +1,10 @@ [package] -description = "Use Minecraft's registries." -edition = "2021" -license = "MIT" name = "azalea-registry" -repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-registry" -version = "0.10.3+mc1.21.4" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +description = "Use Minecraft's registries." +version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +repository = { workspace = true } [dependencies] azalea-buf = { path = "../azalea-buf", version = "0.10.0" } diff --git a/azalea-registry/azalea-registry-macros/Cargo.toml b/azalea-registry/azalea-registry-macros/Cargo.toml index f9e21c57..409ca831 100644 --- a/azalea-registry/azalea-registry-macros/Cargo.toml +++ b/azalea-registry/azalea-registry-macros/Cargo.toml @@ -1,16 +1,14 @@ [package] -description = "Macros internally used in azalea-registry." -edition = "2021" -license = "MIT" name = "azalea-registry-macros" -repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-registry/azalea-registry-macros" -version = "0.10.3+mc1.21.4" +description = "Macros internally used in azalea-registry." +version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +repository = { workspace = true } [lib] proc-macro = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] #proc-macro2 = { workspace = true } quote = { workspace = true } diff --git a/azalea-registry/src/tags/blocks.rs b/azalea-registry/src/tags/blocks.rs index f4b2aaf5..08def1b3 100644 --- a/azalea-registry/src/tags/blocks.rs +++ b/azalea-registry/src/tags/blocks.rs @@ -1,7 +1,6 @@ // This file was generated by codegen/lib/code/tags.py, don't edit it manually! -use std::collections::HashSet; -use std::sync::LazyLock; +use std::{collections::HashSet, sync::LazyLock}; use crate::Block; diff --git a/azalea-registry/src/tags/fluids.rs b/azalea-registry/src/tags/fluids.rs index 299fb301..0713a655 100644 --- a/azalea-registry/src/tags/fluids.rs +++ b/azalea-registry/src/tags/fluids.rs @@ -1,7 +1,6 @@ // This file was generated by codegen/lib/code/tags.py, don't edit it manually! -use std::collections::HashSet; -use std::sync::LazyLock; +use std::{collections::HashSet, sync::LazyLock}; use crate::Fluid; diff --git a/azalea-registry/src/tags/items.rs b/azalea-registry/src/tags/items.rs index f20b5f66..f7ec01a5 100644 --- a/azalea-registry/src/tags/items.rs +++ b/azalea-registry/src/tags/items.rs @@ -1,7 +1,6 @@ // This file was generated by codegen/lib/code/tags.py, don't edit it manually! -use std::collections::HashSet; -use std::sync::LazyLock; +use std::{collections::HashSet, sync::LazyLock}; use crate::Item; |
