Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix master / update toolchain to 2020-08-15

Browse Source
This commit is contained in:
Marcel Märtens 2020-08-17 10:28:02 +02:00
parent 8f8b20c913
commit 10970841cc
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network/src/lib.rs
View File

@ -1,7 +1,7 @@
#![deny(unsafe_code)]
#![cfg_attr(test, deny(rust_2018_idioms))]
#![cfg_attr(test, deny(warnings))]
#![feature(try_trait, const_if_match)]
#![feature(try_trait)]
//! Crate to handle high level networking of messages with different
//! requirements and priorities over a number of protocols

20
network/src/message.rs
View File

@ -112,26 +112,14 @@ pub(crate) fn partial_eq_bincode(first: &bincode::ErrorKind, second: &bincode::E
bincode::ErrorKind::InvalidBoolEncoding(s) => f == s,
_ => false,
},
bincode::ErrorKind::InvalidCharEncoding => match *second {
bincode::ErrorKind::InvalidCharEncoding => true,
_ => false,
},
bincode::ErrorKind::InvalidCharEncoding => matches!(*second, bincode::ErrorKind::InvalidCharEncoding),
bincode::ErrorKind::InvalidTagEncoding(f) => match *second {
bincode::ErrorKind::InvalidTagEncoding(s) => f == s,
_ => false,
},
bincode::ErrorKind::DeserializeAnyNotSupported => match *second {
bincode::ErrorKind::DeserializeAnyNotSupported => true,
_ => false,
},
bincode::ErrorKind::SizeLimit => match *second {
bincode::ErrorKind::SizeLimit => true,
_ => false,
},
bincode::ErrorKind::SequenceMustHaveLength => match *second {
bincode::ErrorKind::SequenceMustHaveLength => true,
_ => false,
},
bincode::ErrorKind::DeserializeAnyNotSupported => matches!(*second, bincode::ErrorKind::DeserializeAnyNotSupported),
bincode::ErrorKind::SizeLimit => matches!(*second, bincode::ErrorKind::SizeLimit),
bincode::ErrorKind::SequenceMustHaveLength => matches!(*second, bincode::ErrorKind::SequenceMustHaveLength),
bincode::ErrorKind::Custom(ref f) => match *second {
bincode::ErrorKind::Custom(ref s) => f == s,
_ => false,

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2020-06-22
nightly-2020-08-15