Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix workspaces and Cargo dependencies

Browse Source
This commit is contained in:
Marcel Märtens 2020-05-27 18:20:16 +02:00
parent 9354952a7f
commit 8f65168506
2 changed files with 346 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

652
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
server/src/lib.rs
View File

@ -79,7 +79,7 @@ pub struct Server {
thread_pool: ThreadPool, thread_pool: ThreadPool,
server_info: ServerInfo, server_info: ServerInfo,
metrics: ServerMetrics, _metrics: ServerMetrics,
tick_metrics: TickMetrics, tick_metrics: TickMetrics,
server_settings: ServerSettings, server_settings: ServerSettings,
@ -242,7 +242,7 @@ impl Server {
git_date: common::util::GIT_DATE.to_string(), git_date: common::util::GIT_DATE.to_string(),
auth_provider: settings.auth_server_address.clone(), auth_provider: settings.auth_server_address.clone(),
}, },
metrics, _metrics: metrics,
tick_metrics, tick_metrics,
server_settings: settings.clone(), server_settings: settings.clone(),
}; };