From 4bfa0b01f95454bb6d52199bd806ab0cc4c774b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Sun, 3 Jan 2021 21:12:55 +0100
Subject: [PATCH] switch toolchain to nightly-2021-01-01
---
common/sys/src/phys.rs | 4 ++--
rust-toolchain | 2 +-
voxygen/src/menu/char_selection/ui/mod.rs | 4 ++--
voxygen/src/ui/mod.rs | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/sys/src/phys.rs b/common/sys/src/phys.rs
index c0303a13bb..47164f0482 100644
--- a/common/sys/src/phys.rs
+++ b/common/sys/src/phys.rs
@@ -471,7 +471,7 @@ impl<'a> System<'a> for Sys {
None
})
- };
+ }
let z_range = z_min..z_max;
// Function for determining whether the player at a specific position collides
@@ -486,7 +486,7 @@ impl<'a> System<'a> for Sys {
) -> bool {
collision_iter(pos, terrain, &|block| block.is_solid() && hit(block), &Block::solid_height, near_iter, radius, z_range).count()
> 0
- };
+ }
let was_on_ground = physics_state.on_ground;
physics_state.on_ground = false;
diff --git a/rust-toolchain b/rust-toolchain
index 533416084a..a2b82fb1f4 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-12-09
\ No newline at end of file
+nightly-2021-01-01
diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs
index a126c2e1ef..f94d071af1 100644
--- a/voxygen/src/menu/char_selection/ui/mod.rs
+++ b/voxygen/src/menu/char_selection/ui/mod.rs
@@ -947,7 +947,7 @@ impl Controls {
])
.align_items(Align::Center)
.into()
- };
+ }
fn char_slider_greyable<'a>(
active: bool,
text: &str,
@@ -984,7 +984,7 @@ impl Controls {
.align_items(Align::Center)
.into()
}
- };
+ }
let slider_options = Column::with_children(vec![
char_slider(
diff --git a/voxygen/src/ui/mod.rs b/voxygen/src/ui/mod.rs
index 1ea62ee7dd..9bb63506e2 100644
--- a/voxygen/src/ui/mod.rs
+++ b/voxygen/src/ui/mod.rs
@@ -576,7 +576,7 @@ impl Ui {
enum State {
Image(TexId),
Plain,
- };
+ }
let mut current_state = State::Plain;
let mut start = 0;
@@ -590,7 +590,7 @@ impl Ui {
Interface,
// Number of primitives left to render ingame and visibility
InWorld(usize, bool),
- };
+ }
let mut placement = Placement::Interface;