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

Move voxygen to 2021 edition

Browse Source
This commit is contained in:
juliancoffee 2022-01-26 15:38:47 +02:00
parent 25b04e6ee7
commit 6a0458ddf1
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Imbris <imbrisf@gmail.com>"]
default-run = "veloren-voxygen"
edition = "2018"
edition = "2021"
name = "veloren-voxygen"
version = "0.11.0"
# Cargo thinks it should build the voxygen binary even when a specific bench is specified for building

2
voxygen/src/scene/figure/load.rs
View File

@ -117,7 +117,7 @@ macro_rules! make_vox_spec {
(
$body:ty,
struct $Spec:ident { $( $(+)? $field:ident: $ty:ty = $asset_path:literal),* $(,)? },
|$self_pat:pat, $spec_pat:pat| $bone_meshes:block $(,)?
|$self_pat:pat, $spec_pat:pat_param| $bone_meshes:block $(,)?
) => {
#[derive(Clone)]
pub struct $Spec {

2
voxygen/src/ui/egui/mod.rs
View File

@ -90,8 +90,6 @@ impl EguiState {
},
},
EguiAction::SetExperimentalShader(shader, enabled) => {
// TODO Rust 2021
use core::convert::TryFrom;
if let Ok(shader) = ExperimentalShader::try_from(shader.as_str()) {
let shaders = &mut new_render_mode
.get_or_insert_with(|| settings.graphics.render_mode.clone())