commit
1a9e8d406c
|
@ -11,7 +11,7 @@ jobs:
|
|||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
# TODO: refactor toolchain version
|
||||
toolchain: 1.53.0
|
||||
toolchain: 1.54.0
|
||||
components: clippy, rustfmt
|
||||
default: true
|
||||
- name: Install dependencies
|
||||
|
@ -49,7 +49,7 @@ jobs:
|
|||
- name: Install Rust
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: 1.53.0
|
||||
toolchain: 1.54.0
|
||||
components: clippy, rustfmt
|
||||
default: true
|
||||
- name: Build binary
|
||||
|
@ -83,7 +83,7 @@ jobs:
|
|||
- name: Install Rust
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: 1.53.0
|
||||
toolchain: 1.54.0
|
||||
components: clippy, rustfmt
|
||||
default: true
|
||||
- name: Build binary
|
||||
|
@ -128,7 +128,7 @@ jobs:
|
|||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
# TODO: refactor toolchain version
|
||||
toolchain: 1.53.0
|
||||
toolchain: 1.54.0
|
||||
components: clippy, rustfmt
|
||||
default: true
|
||||
- name: Install wasm-pack
|
||||
|
|
|
@ -67,7 +67,7 @@ from [GitHub Actions](https://actions-badge.atrox.dev/iceiix/stevenarella/goto?r
|
|||
|
||||
## Dependencies
|
||||
|
||||
Requires Rust stable version 1.53.0 or newer.
|
||||
Requires Rust stable version 1.54.0 or newer.
|
||||
|
||||
**Debian/Ubuntu**
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ pub struct Game {
|
|||
impl Game {
|
||||
pub fn connect_to(&mut self, address: &str) {
|
||||
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())
|
||||
{
|
||||
Ok(res) => {
|
||||
|
@ -509,6 +509,7 @@ fn main2() {
|
|||
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) {
|
||||
return;
|
||||
}
|
||||
|
@ -516,7 +517,7 @@ fn main2() {
|
|||
#[cfg(not(target_arch = "wasm32"))]
|
||||
{
|
||||
tick_all(
|
||||
&winit_window,
|
||||
winit_window,
|
||||
&mut game,
|
||||
&mut ui_container,
|
||||
&mut last_frame,
|
||||
|
|
|
@ -518,7 +518,7 @@ impl super::Screen for ServerList {
|
|||
} else {
|
||||
&res.protocol_name
|
||||
};
|
||||
let mut txt = TextComponent::new(&st);
|
||||
let mut txt = TextComponent::new(st);
|
||||
txt.modifier.color = Some(format::Color::Yellow);
|
||||
let mut msg = Component::Text(txt);
|
||||
format::convert_legacy(&mut msg);
|
||||
|
|
|
@ -1823,8 +1823,7 @@ impl Server {
|
|||
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,
|
||||
Err(err) => {
|
||||
error!("Failed to parse skin blob, {:?}", err);
|
||||
|
|
|
@ -1643,7 +1643,7 @@ impl TextBox {
|
|||
|
||||
fn transform_input(&self) -> String {
|
||||
if self.password {
|
||||
::std::iter::repeat('*').take(self.input.len()).collect()
|
||||
"*".repeat(self.input.len())
|
||||
} else {
|
||||
self.input.clone()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue