Merge pull request #580 from iceiix/rust1.54

Update to Rust 1.54
This commit is contained in:
iceiix 2021-08-05 07:00:13 -07:00 committed by GitHub
commit 1a9e8d406c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions

View File

@ -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.53.0 toolchain: 1.54.0
components: clippy, rustfmt components: clippy, rustfmt
default: true default: true
- name: Install dependencies - name: Install dependencies
@ -49,7 +49,7 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: 1.53.0 toolchain: 1.54.0
components: clippy, rustfmt components: clippy, rustfmt
default: true default: true
- name: Build binary - name: Build binary
@ -83,7 +83,7 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: 1.53.0 toolchain: 1.54.0
components: clippy, rustfmt components: clippy, rustfmt
default: true default: true
- name: Build binary - name: Build binary
@ -128,7 +128,7 @@ jobs:
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
# TODO: refactor toolchain version # TODO: refactor toolchain version
toolchain: 1.53.0 toolchain: 1.54.0
components: clippy, rustfmt components: clippy, rustfmt
default: true default: true
- name: Install wasm-pack - name: Install wasm-pack

View File

@ -67,7 +67,7 @@ from [GitHub Actions](https://actions-badge.atrox.dev/iceiix/stevenarella/goto?r
## Dependencies ## Dependencies
Requires Rust stable version 1.53.0 or newer. Requires Rust stable version 1.54.0 or newer.
**Debian/Ubuntu** **Debian/Ubuntu**

View File

@ -92,7 +92,7 @@ pub struct Game {
impl Game { impl Game {
pub fn connect_to(&mut self, address: &str) { pub fn connect_to(&mut self, address: &str) {
let (protocol_version, forge_mods, fml_network_version) = let (protocol_version, forge_mods, fml_network_version) =
match protocol::Conn::new(&address, self.default_protocol_version) match protocol::Conn::new(address, self.default_protocol_version)
.and_then(|conn| conn.do_status()) .and_then(|conn| conn.do_status())
{ {
Ok(res) => { Ok(res) => {
@ -509,6 +509,7 @@ fn main2() {
glutin_window.resize(physical_size); glutin_window.resize(physical_size);
} }
#[allow(clippy::needless_borrow)] // needless for native, not for web
if !handle_window_event(&winit_window, &mut game, &mut ui_container, event) { if !handle_window_event(&winit_window, &mut game, &mut ui_container, event) {
return; return;
} }
@ -516,7 +517,7 @@ fn main2() {
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
{ {
tick_all( tick_all(
&winit_window, winit_window,
&mut game, &mut game,
&mut ui_container, &mut ui_container,
&mut last_frame, &mut last_frame,

View File

@ -518,7 +518,7 @@ impl super::Screen for ServerList {
} else { } else {
&res.protocol_name &res.protocol_name
}; };
let mut txt = TextComponent::new(&st); let mut txt = TextComponent::new(st);
txt.modifier.color = Some(format::Color::Yellow); txt.modifier.color = Some(format::Color::Yellow);
let mut msg = Component::Text(txt); let mut msg = Component::Text(txt);
format::convert_legacy(&mut msg); format::convert_legacy(&mut msg);

View File

@ -1823,8 +1823,7 @@ impl Server {
continue; continue;
} }
}; };
let skin_blob: serde_json::Value = match serde_json::from_slice(&skin_blob) let skin_blob: serde_json::Value = match serde_json::from_slice(skin_blob) {
{
Ok(val) => val, Ok(val) => val,
Err(err) => { Err(err) => {
error!("Failed to parse skin blob, {:?}", err); error!("Failed to parse skin blob, {:?}", err);

View File

@ -1643,7 +1643,7 @@ impl TextBox {
fn transform_input(&self) -> String { fn transform_input(&self) -> String {
if self.password { if self.password {
::std::iter::repeat('*').take(self.input.len()).collect() "*".repeat(self.input.len())
} else { } else {
self.input.clone() self.input.clone()
} }