Skip to content

Commit 4755ae9

Browse files
committed
Very small cleaning
1 parent 159ce6b commit 4755ae9

File tree

4 files changed

+7
-69
lines changed

4 files changed

+7
-69
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ session.lock
130130
version.json
131131
eula.txt
132132

133+
src/server.properties
134+
133135
# macOS files
134136
.DS_Store
135137

src/fs_manager/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ pub fn write_ops_json(
183183
.read(true)
184184
.write(true)
185185
.truncate(true)
186-
.open(consts::file_paths::OPERATORS)?;
186+
.open(filename)?;
187187

188188
let mut content = String::new();
189189
file.read_to_string(&mut content)?;

src/net/packet/mod.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ pub mod data_types;
55
pub mod utils;
66

77
use core::fmt;
8-
use std::{collections::VecDeque, fmt::Debug, io::Read, vec};
8+
use std::{collections::VecDeque, fmt::Debug};
99

1010
use bytes::BytesMut;
1111
use data_types::varint;
12-
use image::error;
1312
use log::warn;
1413
use thiserror::Error;
1514

@@ -48,12 +47,12 @@ pub struct Packet {
4847

4948
impl Packet {
5049
/// Initalizes a new `Packet` by parsing the `data` buffer.
51-
pub fn new(data: &[u8]) -> Result<Self, PacketError> {
52-
let parsed = Self::parse_packet(&data)?;
50+
pub fn new<T: AsRef<[u8]>>(data: T) -> Result<Self, PacketError> {
51+
let parsed = Self::parse_packet(data.as_ref())?;
5352
Ok(Self {
5453
length: parsed.0,
5554
id: parsed.1,
56-
data: data.into(),
55+
data: data.as_ref().into(),
5756
payload: parsed.2.into(),
5857
})
5958
}

src/server.properties

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)