Skip to content

Commit 40f81c6

Browse files
nick1udwignick1udwig
committed
update fs to use tweaked variants
1 parent 75d3f10 commit 40f81c6

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

‎src/kv.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub enum KvResponse {
3030
Ok,
3131
BeginTx { tx_id: u64 },
3232
Get { key: Vec<u8> },
33-
Err { error: KvError },
33+
Err(KvError),
3434
}
3535

3636
#[derive(Debug, Serialize, Deserialize, Error)]
@@ -93,7 +93,7 @@ where
9393
.map_err(|e| anyhow::anyhow!("Failed to deserialize value: {}", e))?;
9494
Ok(value)
9595
}
96-
KvResponse::Err { error } => Err(error.into()),
96+
KvResponse::Err(error) => Err(error.into()),
9797
_ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
9898
}
9999
}
@@ -122,7 +122,7 @@ where
122122

123123
match response {
124124
KvResponse::Ok => Ok(()),
125-
KvResponse::Err { error } => Err(error.into()),
125+
KvResponse::Err(error) => Err(error.into()),
126126
_ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
127127
}
128128
}
@@ -148,7 +148,7 @@ where
148148

149149
match response {
150150
KvResponse::Ok => Ok(()),
151-
KvResponse::Err { error } => Err(error.into()),
151+
KvResponse::Err(error) => Err(error.into()),
152152
_ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
153153
}
154154
}
@@ -173,7 +173,7 @@ where
173173

174174
match response {
175175
KvResponse::BeginTx { tx_id } => Ok(tx_id),
176-
KvResponse::Err { error } => Err(error.into()),
176+
KvResponse::Err(error) => Err(error.into()),
177177
_ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
178178
}
179179
}
@@ -198,7 +198,7 @@ where
198198

199199
match response {
200200
KvResponse::Ok => Ok(()),
201-
KvResponse::Err { error } => Err(error.into()),
201+
KvResponse::Err(error) => Err(error.into()),
202202
_ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
203203
}
204204
}
@@ -235,7 +235,7 @@ where
235235
timeout,
236236
_marker: PhantomData,
237237
}),
238-
KvResponse::Err { error } => Err(error.into()),
238+
KvResponse::Err(error) => Err(error.into()),
239239
_ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
240240
}
241241
}
@@ -262,7 +262,7 @@ pub fn remove_db(package_id: PackageId, db: &str, timeout: Option<u64>) -> anyho
262262

263263
match response {
264264
KvResponse::Ok => Ok(()),
265-
KvResponse::Err { error } => Err(error.into()),
265+
KvResponse::Err(error) => Err(error.into()),
266266
_ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
267267
}
268268
}

‎src/sqlite.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub enum SqliteResponse {
3636
Ok,
3737
Read,
3838
BeginTx { tx_id: u64 },
39-
Err { error: SqliteError },
39+
Err(SqliteError),
4040
}
4141

4242
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -117,7 +117,7 @@ impl Sqlite {
117117
})?;
118118
Ok(values)
119119
}
120-
SqliteResponse::Err { error } => Err(error.into()),
120+
SqliteResponse::Err(error) => Err(error.into()),
121121
_ => Err(anyhow::anyhow!(
122122
"sqlite: unexpected response {:?}",
123123
response
@@ -151,7 +151,7 @@ impl Sqlite {
151151

152152
match response {
153153
SqliteResponse::Ok => Ok(()),
154-
SqliteResponse::Err { error } => Err(error.into()),
154+
SqliteResponse::Err(error) => Err(error.into()),
155155
_ => Err(anyhow::anyhow!(
156156
"sqlite: unexpected response {:?}",
157157
response
@@ -179,7 +179,7 @@ impl Sqlite {
179179

180180
match response {
181181
SqliteResponse::BeginTx { tx_id } => Ok(tx_id),
182-
SqliteResponse::Err { error } => Err(error.into()),
182+
SqliteResponse::Err(error) => Err(error.into()),
183183
_ => Err(anyhow::anyhow!(
184184
"sqlite: unexpected response {:?}",
185185
response
@@ -207,7 +207,7 @@ impl Sqlite {
207207

208208
match response {
209209
SqliteResponse::Ok => Ok(()),
210-
SqliteResponse::Err { error } => Err(error.into()),
210+
SqliteResponse::Err(error) => Err(error.into()),
211211
_ => Err(anyhow::anyhow!(
212212
"sqlite: unexpected response {:?}",
213213
response
@@ -242,7 +242,7 @@ pub fn open(package_id: PackageId, db: &str, timeout: Option<u64>) -> anyhow::Re
242242
db: db.to_string(),
243243
timeout,
244244
}),
245-
SqliteResponse::Err { error } => Err(error.into()),
245+
SqliteResponse::Err(error) => Err(error.into()),
246246
_ => Err(anyhow::anyhow!(
247247
"sqlite: unexpected response {:?}",
248248
response
@@ -272,7 +272,7 @@ pub fn remove_db(package_id: PackageId, db: &str, timeout: Option<u64>) -> anyho
272272

273273
match response {
274274
SqliteResponse::Ok => Ok(()),
275-
SqliteResponse::Err { error } => Err(error.into()),
275+
SqliteResponse::Err(error) => Err(error.into()),
276276
_ => Err(anyhow::anyhow!(
277277
"sqlite: unexpected response {:?}",
278278
response

‎src/vfs/file.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ impl File {
8181
/// Read into buffer from current cursor position
8282
/// Returns the amount of bytes read.
8383
pub fn read_at(&self, buffer: &mut [u8]) -> Result<usize, VfsError> {
84-
let length = buffer.len();
84+
let length = buffer.len() as u64;
8585

86-
let message = vfs_request(&self.path, VfsAction::ReadExact(length as u64))
86+
let message = vfs_request(&self.path, VfsAction::ReadExact { length })
8787
.send_and_await_response(self.timeout)
8888
.unwrap()
8989
.map_err(|e| VfsError::IOError {
@@ -216,7 +216,7 @@ impl File {
216216
/// Seek file to position.
217217
/// Returns the new position.
218218
pub fn seek(&mut self, pos: SeekFrom) -> Result<u64, VfsError> {
219-
let message = vfs_request(&self.path, VfsAction::Seek { seek_from: pos })
219+
let message = vfs_request(&self.path, VfsAction::Seek(pos))
220220
.send_and_await_response(self.timeout)
221221
.unwrap()
222222
.map_err(|e| VfsError::IOError {
@@ -225,7 +225,9 @@ impl File {
225225
})?;
226226

227227
match parse_response(message.body())? {
228-
VfsResponse::SeekFrom(new_pos) => Ok(new_pos),
228+
VfsResponse::SeekFrom {
229+
new_offset: new_pos,
230+
} => Ok(new_pos),
229231
VfsResponse::Err(e) => Err(e),
230232
_ => Err(VfsError::ParseError {
231233
error: "unexpected response".to_string(),

‎src/vfs/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ pub enum VfsAction {
3232
Read,
3333
ReadDir,
3434
ReadToEnd,
35-
ReadExact(u64),
35+
ReadExact { length: u64 },
3636
ReadToString,
37-
Seek { seek_from: SeekFrom },
37+
Seek(SeekFrom),
3838
RemoveFile,
3939
RemoveDir,
4040
RemoveDirAll,
@@ -79,7 +79,7 @@ pub enum VfsResponse {
7979
Ok,
8080
Err(VfsError),
8181
Read,
82-
SeekFrom(u64),
82+
SeekFrom { new_offset: u64 },
8383
ReadDir(Vec<DirEntry>),
8484
ReadToString(String),
8585
Metadata(FileMetadata),

0 commit comments

Comments
 (0)