Merge branch 'soruh/update-toolchain' into 'master'

Update the toolchain to `nightly-2019-11-04`

See merge request veloren/veloren!645

common/src/lib.rs

@@ -1,9 +1,6 @@
 #![deny(unsafe_code)]
 #![type_length_limit = "1664759"]
-#![feature(
-    trait_alias,
-    option_flattening, // Converts Option<Option<Item>> into Option<Item> TODO: Remove this once this feature becomes stable
-)]
+#![feature(trait_alias)]
 
 #[macro_use]
 extern crate serde_derive;

rust-toolchain

@@ -1 +1 @@
-nightly-2019-10-03
+nightly-2019-11-04

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,

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,

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,

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,

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,

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,

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,

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,

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;