Update to Rust 1.59.0 (#718)
* Update to Rust 1.59.0 * Fix clippy::single_char_pattern in console, ui/logo * Fix clippy::needless_late_init in load_block_entities
This commit is contained in:
parent
303783f4f5
commit
bbbe58a112
|
@ -11,7 +11,7 @@ jobs:
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
# TODO: refactor toolchain version
|
# TODO: refactor toolchain version
|
||||||
toolchain: 1.58.1
|
toolchain: 1.59.0
|
||||||
components: clippy, rustfmt
|
components: clippy, rustfmt
|
||||||
default: true
|
default: true
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
@ -60,7 +60,7 @@ jobs:
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.58.1
|
toolchain: 1.59.0
|
||||||
components: clippy, rustfmt
|
components: clippy, rustfmt
|
||||||
default: true
|
default: true
|
||||||
- name: Build binary
|
- name: Build binary
|
||||||
|
@ -105,7 +105,7 @@ jobs:
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.58.1
|
toolchain: 1.59.0
|
||||||
components: clippy, rustfmt
|
components: clippy, rustfmt
|
||||||
default: true
|
default: true
|
||||||
- name: Build binary
|
- name: Build binary
|
||||||
|
@ -161,7 +161,7 @@ jobs:
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
# TODO: refactor toolchain version
|
# TODO: refactor toolchain version
|
||||||
toolchain: 1.58.1
|
toolchain: 1.59.0
|
||||||
components: clippy, rustfmt
|
components: clippy, rustfmt
|
||||||
default: true
|
default: true
|
||||||
- name: Install wasm-pack
|
- name: Install wasm-pack
|
||||||
|
|
|
@ -3,7 +3,7 @@ name = "stevenarella"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
authors = [ "Thinkofdeath <thinkofdeath@spigotmc.org>", "iceiix <ice_ix@protonmail.ch>" ]
|
authors = [ "Thinkofdeath <thinkofdeath@spigotmc.org>", "iceiix <ice_ix@protonmail.ch>" ]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.58.1"
|
rust-version = "1.59.0"
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
description = "Multi-protocol multi-platform Minecraft-compatible client"
|
description = "Multi-protocol multi-platform Minecraft-compatible client"
|
||||||
repository = "https://github.com/iceiix/stevenarella"
|
repository = "https://github.com/iceiix/stevenarella"
|
||||||
|
|
|
@ -70,7 +70,7 @@ from [GitHub Actions](https://actions-badge.atrox.dev/iceiix/stevenarella/goto?r
|
||||||
|
|
||||||
## Dependencies
|
## Dependencies
|
||||||
|
|
||||||
Requires Rust stable version 1.58.1 or newer.
|
Requires Rust stable version 1.59.0 or newer.
|
||||||
|
|
||||||
**Debian/Ubuntu**
|
**Debian/Ubuntu**
|
||||||
|
|
||||||
|
|
|
@ -370,7 +370,7 @@ impl Console {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut file = &record.file().unwrap_or("").replace("\\", "/")[..];
|
let mut file = &record.file().unwrap_or("").replace('\\', "/")[..];
|
||||||
if let Some(pos) = file.rfind("src/") {
|
if let Some(pos) = file.rfind("src/") {
|
||||||
file = &file[pos + 4..];
|
file = &file[pos + 4..];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1947,13 +1947,12 @@ impl Server {
|
||||||
let z = block_entity.1.get("z").unwrap().as_int().unwrap();
|
let z = block_entity.1.get("z").unwrap().as_int().unwrap();
|
||||||
if let Some(tile_id) = block_entity.1.get("id") {
|
if let Some(tile_id) = block_entity.1.get("id") {
|
||||||
let tile_id = tile_id.as_str().unwrap();
|
let tile_id = tile_id.as_str().unwrap();
|
||||||
let action;
|
let action = match tile_id {
|
||||||
match tile_id {
|
|
||||||
// Fake a sign update
|
// Fake a sign update
|
||||||
"Sign" => action = 9,
|
"Sign" => 9,
|
||||||
// Not something we care about, so break the loop
|
// Not something we care about, so break the loop
|
||||||
_ => continue,
|
_ => continue,
|
||||||
}
|
};
|
||||||
self.on_block_entity_update_u8(packet::play::clientbound::UpdateBlockEntity_u8 {
|
self.on_block_entity_update_u8(packet::play::clientbound::UpdateBlockEntity_u8 {
|
||||||
location: Position::new(x, y, z),
|
location: Position::new(x, y, z),
|
||||||
action,
|
action,
|
||||||
|
|
|
@ -99,7 +99,7 @@ impl Logo {
|
||||||
let mut texts = String::new();
|
let mut texts = String::new();
|
||||||
file.read_to_string(&mut texts).unwrap();
|
file.read_to_string(&mut texts).unwrap();
|
||||||
for line in texts.lines() {
|
for line in texts.lines() {
|
||||||
text_strings.push(line.to_owned().replace("\r", ""));
|
text_strings.push(line.to_owned().replace('\r', ""));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let mut r: rand_pcg::Pcg32 =
|
let mut r: rand_pcg::Pcg32 =
|
||||||
|
|
Loading…
Reference in New Issue