From e3bd152d2443908f1af9adb4c67b0737801731f5 Mon Sep 17 00:00:00 2001 From: soruh Date: Mon, 4 Nov 2019 18:26:32 +0100 Subject: [PATCH] update toolchain to `nightly-2019-11-04` --- common/src/lib.rs | 5 +---- rust-toolchain | 2 +- voxygen/src/anim/biped_large/idle.rs | 2 +- voxygen/src/anim/bird_medium/idle.rs | 2 +- voxygen/src/anim/bird_small/idle.rs | 2 +- voxygen/src/anim/dragon/idle.rs | 2 +- voxygen/src/anim/fish_medium/idle.rs | 2 +- voxygen/src/anim/fish_small/idle.rs | 2 +- voxygen/src/anim/quadruped_medium/idle.rs | 2 +- voxygen/src/anim/quadruped_small/idle.rs | 2 +- world/src/lib.rs | 2 +- 11 files changed, 11 insertions(+), 14 deletions(-) diff --git a/common/src/lib.rs b/common/src/lib.rs index 06a775c88d..4c7196f4ca 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -1,9 +1,6 @@ #![deny(unsafe_code)] #![type_length_limit = "1664759"] -#![feature( - trait_alias, - option_flattening, // Converts Option> into Option TODO: Remove this once this feature becomes stable -)] +#![feature(trait_alias)] #[macro_use] extern crate serde_derive; diff --git a/rust-toolchain b/rust-toolchain index a5fc4c850f..2cf3e8f3a6 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2019-10-03 +nightly-2019-11-04 diff --git a/voxygen/src/anim/biped_large/idle.rs b/voxygen/src/anim/biped_large/idle.rs index 1bae88481e..4f74e1eee4 100644 --- a/voxygen/src/anim/biped_large/idle.rs +++ b/voxygen/src/anim/biped_large/idle.rs @@ -9,7 +9,7 @@ pub struct IdleAnimation; impl Animation for IdleAnimation { type Skeleton = BipedLargeSkeleton; - type Dependency = (f64); + type Dependency = f64; fn update_skeleton( skeleton: &Self::Skeleton, diff --git a/voxygen/src/anim/bird_medium/idle.rs b/voxygen/src/anim/bird_medium/idle.rs index d2156415e7..e14e48887c 100644 --- a/voxygen/src/anim/bird_medium/idle.rs +++ b/voxygen/src/anim/bird_medium/idle.rs @@ -9,7 +9,7 @@ pub struct IdleAnimation; impl Animation for IdleAnimation { type Skeleton = BirdMediumSkeleton; - type Dependency = (f64); + type Dependency = f64; fn update_skeleton( skeleton: &Self::Skeleton, diff --git a/voxygen/src/anim/bird_small/idle.rs b/voxygen/src/anim/bird_small/idle.rs index 9cef0371f3..9f9c207c29 100644 --- a/voxygen/src/anim/bird_small/idle.rs +++ b/voxygen/src/anim/bird_small/idle.rs @@ -9,7 +9,7 @@ pub struct IdleAnimation; impl Animation for IdleAnimation { type Skeleton = BirdSmallSkeleton; - type Dependency = (f64); + type Dependency = f64; fn update_skeleton( skeleton: &Self::Skeleton, diff --git a/voxygen/src/anim/dragon/idle.rs b/voxygen/src/anim/dragon/idle.rs index 9073740442..ae271be2fe 100644 --- a/voxygen/src/anim/dragon/idle.rs +++ b/voxygen/src/anim/dragon/idle.rs @@ -9,7 +9,7 @@ pub struct IdleAnimation; impl Animation for IdleAnimation { type Skeleton = DragonSkeleton; - type Dependency = (f64); + type Dependency = f64; fn update_skeleton( skeleton: &Self::Skeleton, diff --git a/voxygen/src/anim/fish_medium/idle.rs b/voxygen/src/anim/fish_medium/idle.rs index 5a04c110af..bfd71da3f5 100644 --- a/voxygen/src/anim/fish_medium/idle.rs +++ b/voxygen/src/anim/fish_medium/idle.rs @@ -9,7 +9,7 @@ pub struct IdleAnimation; impl Animation for IdleAnimation { type Skeleton = FishMediumSkeleton; - type Dependency = (f64); + type Dependency = f64; fn update_skeleton( skeleton: &Self::Skeleton, diff --git a/voxygen/src/anim/fish_small/idle.rs b/voxygen/src/anim/fish_small/idle.rs index 67ba7bc94f..47b17ad942 100644 --- a/voxygen/src/anim/fish_small/idle.rs +++ b/voxygen/src/anim/fish_small/idle.rs @@ -9,7 +9,7 @@ pub struct IdleAnimation; impl Animation for IdleAnimation { type Skeleton = FishSmallSkeleton; - type Dependency = (f64); + type Dependency = f64; fn update_skeleton( skeleton: &Self::Skeleton, diff --git a/voxygen/src/anim/quadruped_medium/idle.rs b/voxygen/src/anim/quadruped_medium/idle.rs index 54affc86f8..6ae25a7474 100644 --- a/voxygen/src/anim/quadruped_medium/idle.rs +++ b/voxygen/src/anim/quadruped_medium/idle.rs @@ -9,7 +9,7 @@ pub struct IdleAnimation; impl Animation for IdleAnimation { type Skeleton = QuadrupedMediumSkeleton; - type Dependency = (f64); + type Dependency = f64; fn update_skeleton( skeleton: &Self::Skeleton, diff --git a/voxygen/src/anim/quadruped_small/idle.rs b/voxygen/src/anim/quadruped_small/idle.rs index a8410db858..7b9faa7d60 100644 --- a/voxygen/src/anim/quadruped_small/idle.rs +++ b/voxygen/src/anim/quadruped_small/idle.rs @@ -9,7 +9,7 @@ pub struct IdleAnimation; impl Animation for IdleAnimation { type Skeleton = QuadrupedSmallSkeleton; - type Dependency = (f64); + type Dependency = f64; fn update_skeleton( skeleton: &Self::Skeleton, diff --git a/world/src/lib.rs b/world/src/lib.rs index 233d77f06a..75c6a2e69c 100644 --- a/world/src/lib.rs +++ b/world/src/lib.rs @@ -1,6 +1,6 @@ #![deny(unsafe_code)] #![allow(incomplete_features)] -#![feature(const_generics, option_flattening, label_break_value)] +#![feature(const_generics, label_break_value)] mod all; mod block;