From 40f5afc2b0dcfeb9f29d8574215591bcdc1f5a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Fri, 6 Nov 2020 14:14:54 +0100 Subject: [PATCH] ci cleanup, dependency update --- .gitlab/CI/publish.gitlab-ci.yml | 8 +- Cargo.lock | 125 +++++++++++++++++++------------ client/Cargo.toml | 2 +- common/Cargo.toml | 4 +- network/Cargo.toml | 2 +- server-cli/Cargo.toml | 2 +- server/Cargo.toml | 4 +- server/src/metrics.rs | 2 +- voxygen/Cargo.toml | 2 +- world/Cargo.toml | 2 +- 10 files changed, 89 insertions(+), 64 deletions(-) diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml index e17bfa5821..e8266403df 100644 --- a/.gitlab/CI/publish.gitlab-ci.yml +++ b/.gitlab/CI/publish.gitlab-ci.yml @@ -30,11 +30,5 @@ pages: script: - rm -rf public - mkdir -p public - - cargo doc --no-deps --document-private-items --exclude veloren-voxygen --workspace - - mv target/doc/* public - -pages-broken-fix-me-in-future: - extends: .publish - allow_failure: true - script: - cargo doc --no-deps --document-private-items + - mv target/doc/* public \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 7bdaf0910a..068d50c164 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -196,7 +196,7 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures-core", "futures-io", - "futures-timer", + "futures-timer 2.0.2", "kv-log-macro", "log", "memchr", @@ -279,7 +279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 0.1.10", "libc", "miniz_oxide 0.4.2", "object", @@ -316,7 +316,7 @@ checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" dependencies = [ "bitflags", "cexpr", - "cfg-if", + "cfg-if 0.1.10", "clang-sys", "lazy_static", "lazycell", @@ -465,6 +465,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "cgl" version = "0.3.2" @@ -801,7 +807,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "core-foundation-sys 0.7.0", "core-graphics 0.19.2", "libc", @@ -850,7 +856,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -895,7 +901,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-channel 0.3.9", "crossbeam-deque", "crossbeam-epoch 0.7.2", @@ -940,7 +946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" dependencies = [ "arrayvec 0.4.12", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils 0.6.6", "lazy_static", "memoffset", @@ -954,7 +960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.1", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", @@ -977,7 +983,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -988,7 +994,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -999,7 +1005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg 1.0.1", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -1111,7 +1117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f260e2fc850179ef410018660006951c1b55b79e8087e87111a2c388994b9b5" dependencies = [ "ahash", - "cfg-if", + "cfg-if 0.1.10", "num_cpus", ] @@ -1182,11 +1188,11 @@ dependencies = [ [[package]] name = "directories-next" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eaa04e945bec7e2dc7383817c566881d9a83d20a07cc949b54585873585a48" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "dirs-sys-next", ] @@ -1196,7 +1202,7 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "dirs-sys", ] @@ -1383,7 +1389,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi 0.3.9", @@ -1561,6 +1567,12 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + [[package]] name = "futures-util" version = "0.3.5" @@ -1598,7 +1610,7 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -2063,7 +2075,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -2214,7 +2226,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2443d8f0478b16759158b2f66d525991a05491138bc05814ef52a250148ef4f9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "winapi 0.3.9", ] @@ -2310,7 +2322,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -2457,7 +2469,7 @@ version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fuchsia-zircon", "fuchsia-zircon-sys", "iovec", @@ -2600,7 +2612,7 @@ version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "winapi 0.3.9", ] @@ -2613,7 +2625,7 @@ checksum = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -2626,7 +2638,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -2639,7 +2651,7 @@ checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", ] @@ -3007,7 +3019,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3278e0492f961fd4ae70909f56b2723a7e8d01a228427294e19cdfdebda89a17" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libm", ] @@ -3049,7 +3061,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi 0.0.3", "libc", "redox_syscall", @@ -3064,7 +3076,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi 0.0.3", "libc", "redox_syscall", @@ -3078,7 +3090,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi 0.1.0", "instant", "libc", @@ -3282,14 +3294,15 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd" +checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fnv", "lazy_static", - "spin", + "parking_lot 0.11.0", + "regex", "thiserror", ] @@ -3791,7 +3804,7 @@ version = "0.32.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", ] @@ -4042,7 +4055,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi 0.3.9", @@ -4496,7 +4509,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4574,13 +4587,13 @@ dependencies = [ [[package]] name = "tracing-tracy" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4f1c3ed7f680cf645838f62e8dd1f64cd3820ad1af0b8d9585fd69d97f0feab" +checksum = "6f70411ba0d11c4aee042b1c73e68086322a293f8038c53ac95d36319c91ec19" dependencies = [ "tracing-core", "tracing-subscriber", - "tracy-client", + "tracy-client 0.9.0", ] [[package]] @@ -4589,7 +4602,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650c280019cd1a841752d50f6a834216a2c8a810aeb18bdd48054be23cacd8a6" dependencies = [ - "tracy-client-sys", + "tracy-client-sys 0.9.0", +] + +[[package]] +name = "tracy-client" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb214203bffe8cefe9bc0dfc12140f85e8d59b42e1f52f696071fdf8595e066a" +dependencies = [ + "tracy-client-sys 0.10.0", ] [[package]] @@ -4601,6 +4623,15 @@ dependencies = [ "cc", ] +[[package]] +name = "tracy-client-sys" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1b6565366c88aa66599426f400751c5cd7a315f6493b3578da309ae686aaf1" +dependencies = [ + "cc", +] + [[package]] name = "treeculler" version = "0.1.0" @@ -4830,7 +4861,7 @@ dependencies = [ "authc", "byteorder", "futures-executor", - "futures-timer", + "futures-timer 3.0.2", "futures-util", "hashbrown 0.7.2", "image", @@ -4863,7 +4894,7 @@ dependencies = [ "notify", "num-derive", "num-traits 0.2.12", - "parking_lot 0.9.0", + "parking_lot 0.11.0", "rand 0.7.3", "rayon", "ron", @@ -4876,7 +4907,7 @@ dependencies = [ "specs-idvs", "sum_type", "tracing", - "tracy-client", + "tracy-client 0.8.0", "vek 0.12.0", ] @@ -4892,7 +4923,7 @@ dependencies = [ "dotenv", "futures-channel", "futures-executor", - "futures-timer", + "futures-timer 3.0.2", "futures-util", "hashbrown 0.7.2", "itertools", @@ -5024,7 +5055,7 @@ dependencies = [ "minifb", "noise", "num 0.2.1", - "ordered-float 1.1.0", + "ordered-float 2.0.0", "packed_simd_2", "rand 0.7.3", "rand_chacha 0.2.2", @@ -5128,7 +5159,7 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "wasm-bindgen-macro", ] diff --git a/client/Cargo.toml b/client/Cargo.toml index e8122f2bd8..4266514fba 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -17,7 +17,7 @@ byteorder = "1.3.2" uvth = "3.1.1" futures-util = "0.3" futures-executor = "0.3" -futures-timer = "2.0" +futures-timer = "3.0" image = { version = "0.23.8", default-features = false, features = ["png"] } num = "0.2.0" num_cpus = "1.10.1" diff --git a/common/Cargo.toml b/common/Cargo.toml index 79d2a652ce..e2767bcb4a 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -18,7 +18,7 @@ specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", branch = "spec roots = "0.0.6" specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "7a2e348ab2223818bad487695c66c43db88050a5" } vek = { version = "0.12.0", features = ["serde"] } -directories-next = "1.0.1" +directories-next = "2.0" dot_vox = "4.0" image = { version = "0.23.8", default-features = false, features = ["png"] } serde = { version = "1.0.110", features = ["derive", "rc"] } @@ -30,7 +30,7 @@ rand = "0.7" rayon = "1.3.0" lazy_static = "1.4.0" hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] } -parking_lot = "0.9.0" +parking_lot = "0.11.0" crossbeam = "0.7" notify = "5.0.0-pre.3" indexmap = "1.3.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 553ec532ab..11039b8d88 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -24,7 +24,7 @@ async-std = { version = "~1.5", default-features = false, features = ["std", "as #tracing and metrics tracing = { version = "0.1", default-features = false } tracing-futures = "0.2" -prometheus = { version = "0.9", default-features = false, optional = true } +prometheus = { version = "0.10", default-features = false, optional = true } #async futures = { version = "0.3", features = ["thread-pool"] } #mpsc channel registry diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index b35d06d537..cbb1f85c67 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -24,7 +24,7 @@ ron = {version = "0.6", default-features = false} serde = {version = "1.0", features = [ "rc", "derive" ]} # Tracy -tracing-tracy = { version = "0.2.0", optional = true } +tracing-tracy = { version = "0.3.0", optional = true } [dependencies.tui] git = "https://github.com/fdehau/tui-rs.git" diff --git a/server/Cargo.toml b/server/Cargo.toml index 6ca5871d85..3a7172e43f 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -23,7 +23,7 @@ vek = { version = "0.12.0", features = ["serde"] } uvth = "3.1.1" futures-util = "0.3" futures-executor = "0.3" -futures-timer = "2.0" +futures-timer = "3.0" futures-channel = "0.3" itertools = "0.9" lazy_static = "1.4.0" @@ -35,7 +35,7 @@ rand = { version = "0.7", features = ["small_rng"] } chrono = "0.4.9" hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] } crossbeam = "0.7.2" -prometheus = { version = "0.9", default-features = false} +prometheus = { version = "0.10", default-features = false} tiny_http = "0.7.0" portpicker = { git = "https://github.com/xMAC94x/portpicker-rs" } authc = { git = "https://gitlab.com/veloren/auth.git", rev = "b943c85e4a38f5ec60cd18c34c73097640162bfe" } diff --git a/server/src/metrics.rs b/server/src/metrics.rs index 0a303ac244..d52ae33538 100644 --- a/server/src/metrics.rs +++ b/server/src/metrics.rs @@ -283,7 +283,7 @@ impl TickMetrics { "number of all entities currently active on the server", ))?; let opts = Opts::new("veloren_build_info", "Build information") - .const_label("hash", &common::util::GIT_HASH) + .const_label("hash", *common::util::GIT_HASH) .const_label("version", ""); let build_info = IntGauge::with_opts(opts)?; let start_time = IntGauge::with_opts(Opts::new( diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 3711dbb952..e7a4d8a30d 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -56,7 +56,7 @@ copy_dir = "0.1.2" crossbeam = "=0.7.2" deunicode = "1.0" # TODO: remove -directories-next = "1.0.1" +directories-next = "2.0" dot_vox = "4.0" enum-iterator = "0.6" failure = "0.1.6" diff --git a/world/Cargo.toml b/world/Cargo.toml index 24fa9ae0ab..a666fcf2db 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -19,7 +19,7 @@ itertools = "0.9" vek = { version = "0.12.0", features = ["serde"] } noise = { version = "0.6.0", default-features = false } num = "0.2" -ordered-float = "1.0" +ordered-float = "2.0" hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] } lazy_static = "1.4.0" tracing = { version = "0.1", default-features = false }