From 4f2d99f809b837aa16dd82cdcc5438d5e50a1618 Mon Sep 17 00:00:00 2001 From: Acrimon Date: Sun, 11 Aug 2019 21:48:02 +0200 Subject: [PATCH] Switch to hashbrown in server. --- Cargo.lock | 7 +++++++ server/Cargo.toml | 1 + server/src/auth_provider.rs | 2 +- server/src/client.rs | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc77bcf9f1..4486e5e89d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1279,6 +1279,11 @@ dependencies = [ "svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "hashbrown" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "heaptrack" version = "0.3.0" @@ -2929,6 +2934,7 @@ name = "veloren-server" version = "0.3.0" dependencies = [ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3331,6 +3337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum gtk 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d695d6be4110618a97c19cd068e8a00e53e33b87e3c65cdc5397667498b1bc24" "checksum gtk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9554cf5b3a85a13fb39258c65b04b262989c1d7a758f8f555b77a478621a91" "checksum guillotiere 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "182af928b4435d8fbef910535586ecdca95ab4068493769c090e6573477f5e35" +"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" "checksum heaptrack 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a5f3c2341045ae29cc6d1004caf4c043addd7b658f9d11464fd6914dff6609b" "checksum hibitset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6527bc88f32e0d3926c7572874b2bf17a19b36978aacd0aacf75f7d27a5992d0" "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" diff --git a/server/Cargo.toml b/server/Cargo.toml index 9b9812dcf9..17e2a5cd79 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -19,3 +19,4 @@ serde = "1.0.98" serde_derive = "1.0.98" rand = "0.7.0" chrono = "0.4.7" +hashbrown = "0.5.0" diff --git a/server/src/auth_provider.rs b/server/src/auth_provider.rs index 46a49d9503..68160a48e0 100644 --- a/server/src/auth_provider.rs +++ b/server/src/auth_provider.rs @@ -1,5 +1,5 @@ +use hashbrown::HashMap; use log::{info, warn}; -use std::collections::HashMap; pub struct AuthProvider { accounts: HashMap, diff --git a/server/src/client.rs b/server/src/client.rs index fb43465ebb..e174ff411f 100644 --- a/server/src/client.rs +++ b/server/src/client.rs @@ -2,8 +2,8 @@ use common::{ msg::{ClientMsg, ClientState, RequestStateError, ServerMsg}, net::PostBox, }; +use hashbrown::HashMap; use specs::Entity as EcsEntity; -use std::collections::HashMap; pub struct Client { pub client_state: ClientState,