From 82c53bb761b38c11bc78e2b7497651604d976ccf Mon Sep 17 00:00:00 2001 From: Jared Burce Date: Thu, 4 Feb 2021 07:15:35 -0800 Subject: [PATCH] bitrot: update for lang/stdlib deprecations --- src/ega.rs | 4 ++-- src/tile.rs | 4 ++-- src/view.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ega.rs b/src/ega.rs index 325e4b9..627c7e9 100644 --- a/src/ega.rs +++ b/src/ega.rs @@ -124,9 +124,9 @@ fn decode_uncompressed(buf: &[u8]) -> Vec { buf.iter() .flat_map(|tile_byte| { EGA_PALETTE[(tile_byte >> 4u8 & 0xF) as usize] - .into_iter() + .iter() .chain(EGA_PALETTE[(tile_byte & 0xF) as usize] - .into_iter()) + .iter()) }) .map(|x| *x) .collect() diff --git a/src/tile.rs b/src/tile.rs index 8db15d6..89a2b89 100644 --- a/src/tile.rs +++ b/src/tile.rs @@ -66,7 +66,7 @@ impl Tile { 8 => '⨇', // mountain '△' 9 => '☗', // dungeon 10 => '⍟', // city - 11 | 13...15 => '⛫', // castle + 11 | 13..=15 => '⛫', // castle 12 => '❖', // village 22 => '⎔', // tile floor 23 => '⟗', // bridge @@ -104,7 +104,7 @@ impl Tile { 76 => '⌘', // lava // 79 => '💥', // attack flash // 88 | 89 => 'ጿ', // beggar - 96...121 => ::std::char::from_u32((self.val - 31) as u32).unwrap(), + 96..=121 => ::std::char::from_u32((self.val - 31) as u32).unwrap(), 122 => '=', // space 123 => '⊐', // right '' 124 => '⊏', // left '⊨' diff --git a/src/view.rs b/src/view.rs index 9bc6553..f155be7 100644 --- a/src/view.rs +++ b/src/view.rs @@ -80,7 +80,7 @@ impl ViewRoot { assert!(inv_worked, "hmd matrix invert"); for &(eye, buffers) in [(vr::Eye::Left, &self.left), - (vr::Eye::Right, &self.right)].into_iter() { + (vr::Eye::Right, &self.right)].iter() { let target = &buffers.as_ref().expect("vr color buffer").target; let depth = &buffers.as_ref().expect("vr depth buffer").depth;