Merge branch 'updating-thingies' into 'master'

Updated toolchain version and a bunch of deps.

Closes #273

See merge request veloren/veloren!479

.gitlab-ci.yml

@@ -8,6 +8,7 @@ stages:
 variables:
   GIT_STRATEGY: none
 before_script:
+  # Make the directories
   - mkdir -p /cache/veloren
   - rm -rf /cache/veloren/bin
   - cd /cache/veloren
@@ -17,10 +18,12 @@ before_script:
       git clone $CI_REPOSITORY_URL . ;
     fi;
   - mkdir -p /cache/veloren/bin
+  # Remove previous Git files
   - rm -f .git/index.lock
   - rm -f .git/shallow.lock
   - rm -f .git/HEAD.lock
   - rm -f .git/hocks/post-checkout
+  # Do an efficient Git checkout
   - git remote set-url origin $CI_REPOSITORY_URL
   - git fetch origin --prune +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*
   - git checkout -f -q $CI_COMMIT_SHA
@@ -28,14 +31,19 @@ before_script:
       echo "THIS SEEMS TO BE A MERGE PIPELINE FROM ${SOURCE_PROJECT}/${SOURCE_BRANCH}";
       git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}";
     fi;
+  # Prepare Git LFS
   - git lfs install;
   - git lfs fetch;
   - git lfs checkout;
+  # Debug info
   - git status
   - rustup -v show
+  # See what's in the target folder?
   - if [ -d target ]; then
       ls -la target;
     fi;
+  # Overwrite toolchain
+  - cp /rust-toolchain /cache/veloren/rust-toolchain
 
 #############
 # Optional build

client/src/lib.rs

@@ -1,5 +1,5 @@
 #![deny(unsafe_code)]
-#![feature(label_break_value, duration_float, euclidean_division)]
+#![feature(label_break_value)]
 
 pub mod error;
 

common/src/lib.rs

@@ -1,10 +1,7 @@
 #![deny(unsafe_code)]
 #![type_length_limit = "1664759"]
 #![feature(
-    euclidean_division,
-    duration_float,
     trait_alias,
-    bind_by_move_pattern_guards,
     option_flattening, // Converts Option<Option<Item>> into Option<Item> TODO: Remove this once this feature becomes stable
 )]
 

rust-toolchain

@@ -1 +1 @@
-nightly-2019-07-03
+nightly-2019-10-03

server/src/lib.rs

@@ -1,5 +1,5 @@
 #![deny(unsafe_code)]
-#![feature(drain_filter, bind_by_move_pattern_guards)]
+#![feature(drain_filter)]
 
 pub mod auth_provider;
 pub mod client;

voxygen/src/main.rs

@@ -1,5 +1,5 @@
 #![deny(unsafe_code)]
-#![feature(duration_float, drain_filter)]
+#![feature(drain_filter)]
 #![recursion_limit = "2048"]
 
 #[cfg(feature = "discord")]
@@ -197,7 +197,7 @@ fn main() {
         );
 
         #[cfg(feature = "msgbox")]
-        msgbox::create("Voxygen has panicked", &msg, msgbox::IconType::ERROR);
+        msgbox::create("Voxygen has panicked", &msg, msgbox::IconType::Error);
 
         default_hook(panic_info);
     }));

world/src/generator/town/mod.rs

@@ -424,7 +424,7 @@ impl TownVol {
         for _ in 0..n {
             for _ in 0..ATTEMPTS {
                 let entrance = {
-                    let start_col = self.choose_column(rng, |_, col| col.is_road()).unwrap();;
+                    let start_col = self.choose_column(rng, |_, col| col.is_road()).unwrap();
                     let start = Vec3::new(
                         start_col.x,
                         start_col.y,

world/src/lib.rs

@@ -1,11 +1,6 @@
 #![deny(unsafe_code)]
-#![feature(
-    const_generics,
-    euclidean_division,
-    bind_by_move_pattern_guards,
-    option_flattening,
-    label_break_value
-)]
+#![allow(incomplete_features)]
+#![feature(const_generics, option_flattening, label_break_value)]
 
 mod all;
 mod block;

world/src/util/fast_noise.rs

@@ -14,7 +14,7 @@ impl FastNoise {
     }
 
     fn noise_at(&self, pos: Vec3<i32>) -> f32 {
-        (self.noise.get(pos) % 4096) as f32 / 4096.0
+        (self.noise.get(pos) & 4095) as f32 * 0.000244140625
     }
 }