File tree 4 files changed +5
-13
lines changed
4 files changed +5
-13
lines changed Original file line number Diff line number Diff line change @@ -166,7 +166,7 @@ impl Serve9p for EchoServer {
166
166
RW => Ok ( Stat {
167
167
fm : FileMeta :: file ( "rw" , BAZ ) ,
168
168
perms : Perm :: OWNER_READ | Perm :: OWNER_WRITE ,
169
- n_bytes : self . rw . as_bytes ( ) . len ( ) as u64 ,
169
+ n_bytes : self . rw . len ( ) as u64 ,
170
170
last_accesses : SystemTime :: now ( ) ,
171
171
last_modified : SystemTime :: now ( ) ,
172
172
owner : uname. into ( ) ,
@@ -269,7 +269,7 @@ impl Serve9p for EchoServer {
269
269
Stat {
270
270
fm: FileMeta :: file( "rw" , RW ) ,
271
271
perms: Perm :: OWNER_READ | Perm :: OWNER_WRITE ,
272
- n_bytes: self . rw. as_bytes ( ) . len( ) as u64 ,
272
+ n_bytes: self . rw. len( ) as u64 ,
273
273
last_accesses: SystemTime :: now( ) ,
274
274
last_modified: SystemTime :: now( ) ,
275
275
owner: uname. into( ) ,
Original file line number Diff line number Diff line change @@ -820,11 +820,7 @@ where
820
820
match outcome {
821
821
ReadOutcome :: Immediate ( data) => data,
822
822
ReadOutcome :: Blocked ( chan) => {
823
- // Cloning the stream can
824
- let mut stream = match self . stream . try_clone ( ) {
825
- Ok ( stream) => stream,
826
- Err ( err) => return Err ( err) ,
827
- } ;
823
+ let mut stream = self . stream . try_clone ( ) ?;
828
824
829
825
spawn ( move || {
830
826
let data = chan. recv ( ) . unwrap_or_default ( ) ;
Original file line number Diff line number Diff line change @@ -366,7 +366,7 @@ impl BufferNode {
366
366
trace ! ( id=%self . id, %fname, "refreshing file stat" ) ;
367
367
let content = self . current_file_content_as_string ( fname, tx) ?;
368
368
let stat = self . file_stats . get_mut ( fname) ?;
369
- stat. n_bytes = content. as_bytes ( ) . len ( ) as u64 ;
369
+ stat. n_bytes = content. len ( ) as u64 ;
370
370
371
371
Some ( stat. clone ( ) )
372
372
}
Original file line number Diff line number Diff line change @@ -115,11 +115,7 @@ impl<T> ZipList<T> {
115
115
I : IntoIterator < Item = T > ,
116
116
{
117
117
let mut it = iter. into_iter ( ) ;
118
-
119
- let focus = match it. next ( ) {
120
- Some ( t) => t,
121
- None => return None ,
122
- } ;
118
+ let focus = it. next ( ) ?;
123
119
124
120
Some ( Self {
125
121
up : VecDeque :: default ( ) ,
You can’t perform that action at this time.
0 commit comments