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

update toolchain to `nightly-2019-12-11`

See merge request veloren/veloren!682

rust-toolchain

@@ -1 +1 @@
-nightly-2019-11-04
+nightly-2019-12-11

world/src/column/mod.rs

@@ -110,7 +110,7 @@ impl<'a> ColumnGen<'a> {
             .gen_ctx
             .structure_gen
             .get(wpos)
-            .into_iter()
+            .iter()
             .copied()
             .enumerate()
             .for_each(|(i, (pos, seed))| {
@@ -180,7 +180,7 @@ fn quadratic_nearest_point(
     let roots = roots.as_ref();
 
     let min_root = roots
-        .into_iter()
+        .iter()
         .copied()
         .filter_map(|root| {
             let river_point = spline.x * root * root + spline.y * root + spline.z;

world/src/sim/erosion.rs

@@ -1004,7 +1004,7 @@ pub fn get_lakes(h: &[f32], downhill: &mut [isize]) -> (usize, Box<[i32]>, Box<[
     // longer negates its maximum number of passes, but the lake side of the chosen pass.  As such,
     // we should make sure not to rely on using it this way afterwards.
     // provides information about the number of candidate passes in a lake.
-    'outer_final_pass: while let Some(Reverse((_, (chunk_idx, neighbor_idx)))) = candidates.pop() {
+    while let Some(Reverse((_, (chunk_idx, neighbor_idx)))) = candidates.pop() {
         // We have the smallest candidate.
         let lake_idx = indirection_[chunk_idx as usize] as usize;
         let indirection_idx = indirection[chunk_idx as usize];

world/src/sim/util.rs

@@ -229,7 +229,7 @@ pub fn neighbors(posi: usize) -> impl Clone + Iterator<Item = usize> {
         (0, 1),
         (1, 1),
     ]
-    .into_iter()
+    .iter()
     .map(move |&(x, y)| Vec2::new(pos.x + x, pos.y + y))
     .filter(|pos| {
         pos.x >= 0 && pos.y >= 0 && pos.x < WORLD_SIZE.x as i32 && pos.y < WORLD_SIZE.y as i32