Skip to content

Commit

Permalink
Update dependency and fix a clippy warning
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémi Lauzier committed Jun 29, 2021
1 parent 698ca67 commit 38fea40
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 48 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,31 +114,31 @@ amethyst_window = { path = "amethyst_window", version = "0.16.0" }
amethyst_tiles = { path = "amethyst_tiles", version = "0.16.0", optional = true }
winit = { version = "0.25", features = ["serde"] }
crossbeam-channel = "0.5"
derivative = "2.1.1"
derivative = "2.2.0"
log = { version = "0.4", features = ["serde"] }
rayon = "1.5"
rustc_version_runtime = "0.2.0"
sentry = { version = "0.22.0", optional = true }
serde = { version = "1", features = ["derive"] }
palette = { version = "0.4", default-features = false, features = ["serde"] }
palette = { version = "0.5", default-features = false, features = ["serde", "std"] }
thread_profiler = { version = "0.3.0", optional = true }
lazy_static = "1.4.0"
glsl-layout = "0.4"
# until https://github.com/amethyst/legion/pull/186 passed
legion = { version = "0.3", default-features = false, features = [
legion = { version = "0.4", default-features = false, features = [
"serialize",
"crossbeam-events",
"codegen",
] }

[build-dependencies]
dirs-next = "2.0.0"
vergen = "3.1.0"
vergen = "3.2.0"

[dev-dependencies]
derive_more = "0.99.11"
derive_more = "0.99.14"
doc-comment = "0.3.3"
env_logger = "0.8.2"
env_logger = "0.8.4"
err-derive = "0.3.0"
glob = "0.3.0"
ron = "0.6.4"
Expand Down
4 changes: 2 additions & 2 deletions amethyst_animation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ amethyst_core = { path = "../amethyst_core", version = "0.16.0" }
amethyst_error = { path = "../amethyst_error", version = "0.16.0" }
amethyst_rendy = { path = "../amethyst_rendy", version = "0.16.0" }
amethyst_ui = { path = "../amethyst_ui", version = "0.16.0", optional = true }
derivative = "2.1.1"
derivative = "2.2.0"
fnv = "1"
log = "0.4"
minterpolate = { version = "0.4", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
thread_profiler = { version = "0.3", optional = true }
alga = "0.9.3"
type-uuid = "0.1.2"
uuid = "0.8.1"
uuid = "0.8.2"
legion-prefab = { version = "0.1", git = "https://github.com/amethyst/prefab", rev = "7c30249f106e6177549e223ca2823eec8ab6c70b" }

[dev-dependencies]
Expand Down
10 changes: 5 additions & 5 deletions amethyst_assets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repository = "https://github.com/amethyst/amethyst"
amethyst_core = { path = "../amethyst_core", version = "0.16.0" }
amethyst_error = { path = "../amethyst_error", version = "0.16.0" }
crossbeam-queue = "0.3"
derivative = "2.1.1"
derivative = "2.2.0"
crossbeam-channel = "0.5"
derive-new = "0.5"
fnv = "1"
Expand All @@ -36,8 +36,8 @@ ron = "0.6.4"
thread_profiler = { version = "0.3", optional = true }
err-derive = "0.3"
dyn-clone = "1.0"
erased-serde = "0.3.9"
inventory = "0.1.5"
erased-serde = "0.3.16"
inventory = "0.1.10"
lazy_static = "1.4"
distill = { version = "0.0.3", features = [
"serde-1",
Expand All @@ -48,7 +48,7 @@ distill = { version = "0.0.3", features = [
"handle",
] }
uuid = { version = "0.8", features = ["v4"] }
bincode = "1.1"
bincode = "1.3"
type-uuid = "0.1"
futures-executor = { version = "0.3", default-features = false }
legion-prefab = { version = "0.1", git = "https://github.com/amethyst/prefab", rev = "7c30249f106e6177549e223ca2823eec8ab6c70b" }
Expand All @@ -57,7 +57,7 @@ encoding_rs_io = "0.1"
serde-diff = "0.4"
structopt = { version = "0.3", default-features = false, optional = true }
# TODO remove this dependency by wrapping it in distill
tokio = { version = "1.0", features = ["sync"], optional = true }
tokio = { version = "1.7", features = ["sync"], optional = true }

[dev-dependencies]
amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
Expand Down
2 changes: 1 addition & 1 deletion amethyst_audio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ derive-new = "0.5"
log = "0.4"
rodio = "0.11"
serde = { version = "1", features = ["derive"] }
smallvec = { version = "1.2", features = ["serde"] }
smallvec = { version = "1.6", features = ["serde"] }
thread_profiler = { version = "0.3", optional = true }
type-uuid = "0.1"

Expand Down
2 changes: 1 addition & 1 deletion amethyst_config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ license = "MIT/Apache-2.0"
[dependencies]
ron = "0.6.4"
serde_json = { version = "1.0", optional = true }
bincode = { version = "1.3.1", optional = true }
bincode = { version = "1.3.3", optional = true }
serde = "1"
encoding_rs_io = "0.1"

Expand Down
11 changes: 6 additions & 5 deletions amethyst_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ game_clock = "1.1.1"
fern = { version = "0.6", features = ["colored"] }
type-uuid = "0.1"
log = "0.4"
num-traits = "0.2.11"
num-traits = "0.2.14"
serde = { version = "1", features = ["derive"] }
approx = "0.4"
approx = "0.5"
derive-new = "0.5"
getset = "0.1.1"
legion = { version = "0.3.1", default-features = false, features = [
Expand All @@ -32,11 +32,12 @@ legion = { version = "0.3.1", default-features = false, features = [
"codegen",
] }
legion-prefab = { version = "0.1", git = "https://github.com/amethyst/prefab", rev = "7c30249f106e6177549e223ca2823eec8ab6c70b" }
nalgebra = { version = "0.24", default-features = false, features = ["serde-serialize"] }
nalgebra = { version = "0.25", default-features = false, features = ["serde-serialize"] }
rayon = "1.5"
shrev = "1.1.1"
simba = { version = "0.3" }
smallvec = "1.4"
# Update simba only if nalgebra need a new version
simba = { version = "0.4" }
smallvec = "1.6"
spin_sleep = "1.0.0"
thread_profiler = { version = "0.3", optional = true }
serde-diff = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion amethyst_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ syn = { version = "1.0", default-features = false }
quote = "1.0"
proc-macro2 = "1.0"
glob = "0.3.0"
regex = "1.4.3"
regex = "1.5.4"

[dev-dependencies]
amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
Expand Down
2 changes: 1 addition & 1 deletion amethyst_error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ homepage = "https://amethyst.rs/"
repository = "https://github.com/amethyst/amethyst"

[dependencies]
backtrace = "0.3.44"
backtrace = "0.3.60"

[dev-dependencies]
amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
10 changes: 5 additions & 5 deletions amethyst_gltf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ amethyst_animation = { path = "../amethyst_animation", version = "0.16.0" }
amethyst_core = { path = "../amethyst_core", version = "0.16.0" }
amethyst_error = { path = "../amethyst_error", version = "0.16.0" }
amethyst_rendy = { path = "../amethyst_rendy", version = "0.16.0" }
err-derive = "0.2.3"
base64 = "0.11"
err-derive = "0.3.0"
base64 = "0.13"
fnv = "1"
gltf = { version = "0.16", features = ["KHR_lights_punctual"] }
legion-prefab = { version = "0.1", git = "https://github.com/amethyst/prefab", rev = "7c30249f106e6177549e223ca2823eec8ab6c70b" }
hibitset = { version = "0.6.2", features = ["parallel"] }
hibitset = { version = "0.6.3", features = ["parallel"] }
log = "0.4"
mikktspace = "0.2.0"
serde = { version = "1", features = ["derive"] }
Expand All @@ -34,8 +34,8 @@ type-uuid = "0.1"
uuid = { version = "0.8", features = ["v4"] }

thread_profiler = { version = "0.3", optional = true }
image = "0.23.12"
derivative = "2.1.1"
image = "0.23.14"
derivative = "2.2.0"

[dev-dependencies]
amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
Expand Down
4 changes: 2 additions & 2 deletions amethyst_gltf/src/importer/gltf_bytes_converter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ use amethyst_assets::distill_importer::Error;
use gltf::Document;

pub fn convert_bytes(
bytes: &Vec<u8>,
bytes: &[u8],
) -> Result<(Document, Vec<gltf::buffer::Data>, Vec<gltf::image::Data>), Error> {
log::debug!("Starting Gltf import");
let result = gltf::import_slice(&bytes.as_slice());
let result = gltf::import_slice(&bytes);
if let Err(err) = result {
log::error!("Import error: {:?}", err);
return Err(Error::Boxed(Box::new(err)));
Expand Down
6 changes: 3 additions & 3 deletions amethyst_input/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ license = "MIT/Apache-2.0"
amethyst_core = { path = "../amethyst_core", version = "0.16.0" }
amethyst_error = { path = "../amethyst_error", version = "0.16.0" }
amethyst_config = { path = "../amethyst_config/", version = "0.16.0" }
derivative = "2.1.1"
derivative = "2.2.0"
derive-new = "0.5"
fnv = "1"
serde = { version = "1", features = ["derive"] }
winit = { version = "0.25", features = ["serde"] }
sdl2 = { version = "0.34", optional = true }
smallvec = { version = "1.2", features = ["serde"] }
smallvec = { version = "1.6", features = ["serde"] }

thread_profiler = { version = "0.3", optional = true }

[dev-dependencies]
amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
approx = "0.4"
approx = "0.5"

[features]
profiler = ["thread_profiler/thread_profiler"]
Expand Down
2 changes: 1 addition & 1 deletion amethyst_network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ profiler = ["thread_profiler/thread_profiler"]
amethyst_core = { path = "../amethyst_core", version = "0.16.0" }
amethyst_error = { path = "../amethyst_error", version = "0.16.0" }
bytes = "1.0"
laminar = "0.4"
laminar = "0.5"
log = "0.4"
thread_profiler = { version = "0.3", optional = true }
derive-new = "0.5"
Expand Down
10 changes: 5 additions & 5 deletions amethyst_rendy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ palette = { version = "0.4", default-features = false, features = ["serde"] }
ron = "0.6.4"
serde = { version = "1", features = ["derive"] }
fnv = "1"
derivative = "2.1.1"
smallvec = "1.2.0"
derivative = "2.2.0"
smallvec = "1.6.1"
static_assertions = "1.1"
indexmap = { version = "1.3", features = ["rayon"] }
indexmap = { version = "1.7", features = ["rayon"] }
type-uuid = "0.1"
thread_profiler = { version = "0.3", optional = true }
approx = "0.4"
approx = "0.5"
legion-prefab = { version = "0.1", git = "https://github.com/amethyst/prefab", rev = "7c30249f106e6177549e223ca2823eec8ab6c70b" }

[target.'cfg(target_os = "macos")'.dependencies]
Expand All @@ -50,7 +50,7 @@ amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
winit = { version = "0.25", features = ["serde"] }
rayon = "1.5"
more-asserts = "0.2.1"
criterion = "0.3.0"
criterion = "0.3.4"

[features]
default = [
Expand Down
8 changes: 4 additions & 4 deletions amethyst_tiles/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ log = { version = "0.4", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
thread_profiler = { version = "0.3", optional = true }
fnv = "1"
derivative = "2.1.1"
hibitset = { version = "0.6.2", features = ["parallel"] }
smallvec = "1.2.0"
derivative = "2.2.0"
hibitset = { version = "0.6.3", features = ["parallel"] }
smallvec = "1.6.1"
lazy_static = "1.4"
rayon = "1.5"
bitintr = "0.3"
Expand All @@ -41,7 +41,7 @@ err-derive = "0.3"
amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
criterion = "0.3"
more-asserts = "0.2"
approx = "0.4"
approx = "0.5"

[features]
profiler = ["thread_profiler/thread_profiler"]
8 changes: 4 additions & 4 deletions amethyst_ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ amethyst_input = { path = "../amethyst_input", version = "0.16.0" }
amethyst_rendy = { path = "../amethyst_rendy", version = "0.16.0" }
amethyst_window = { path = "../amethyst_window", version = "0.16.0" }
copypasta = "0.7.1"
derivative = "2.1.1"
derivative = "2.2.0"
derive-new = "0.5"
fnv = "1"
glsl-layout = "0.4"
ron = "0.6.4"
serde = { version = "1", features = ["derive"] }
smallvec = "1.2"
smallvec = "1.6"
unicode-normalization = "0.1"
unicode-segmentation = "1.6"
unicode-segmentation = "1.7"
winit = { version = "0.25", features = ["serde"] }
log = "0.4"
font-kit = "0.10.0"
font-kit = "0.10.1"
paste = "1"
rand = "0.8"
lazy_static = "1.4"
Expand Down
2 changes: 1 addition & 1 deletion amethyst_utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ log = "0.4"
serde = { version = "1", features = ["derive"] }
dunce = "1"
thread_profiler = { version = "0.3", optional = true }
derivative = "2.1.3"
derivative = "2.2.0"

[dev-dependencies]
amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
Expand Down
2 changes: 1 addition & 1 deletion amethyst_window/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ log = "0.4"
serde = { version = "1", features = ["derive"] }
thread_profiler = { version = "0.3", optional = true }
winit = { version = "0.25", features = ["serde"] }
image = "0.23.13"
image = "0.23.14"

[dev-dependencies]
amethyst = { path = "../", version = "0.16.0", features = ["renderer"] }
Expand Down

0 comments on commit 38fea40

Please sign in to comment.