Merge branch 'master' into 'master'

Fixes match pattern code that rendered an actionable branch unreachable.

See merge request veloren/veloren!120

Former-commit-id: 06bcf5a6caf32fa80576d56766571c7f9ce7d54d
This commit is contained in:
Forest Anderson 2019-05-12 20:40:09 +00:00
commit 413b67e6ad

View File

@ -226,7 +226,7 @@ impl<S: PostMsg, R: PostMsg> PostBox<S, R> {
for _ in 0..100 {
match outgoing_chunks.pop_front() {
Some(mut chunk) => match stream.write(&chunk) {
Ok(n) => if n == chunk.len() {},
Ok(n) if n == chunk.len() => {}
Ok(n) => {
outgoing_chunks.push_front(chunk.split_off(n));
break;