bitrot: update for lang/stdlib deprecations
This commit is contained in:
@@ -124,9 +124,9 @@ fn decode_uncompressed(buf: &[u8]) -> Vec<u8> {
|
||||
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()
|
||||
|
||||
@@ -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 '⊨'
|
||||
|
||||
@@ -80,7 +80,7 @@ impl ViewRoot<gfx_device_gl::Device, ColorFormat, DepthFormat> {
|
||||
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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user