diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2019-03-20 18:55:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-20 18:55:52 -0400 |
commit | 94405bb61722142e8c4d90bb5f31038fc9aa5f72 (patch) | |
tree | 6f53a7d5ef4e736c7a43eb552850b099249a2de1 /cli/resources.rs | |
parent | 223a2adbb46cb33e75ffe861ecaff6ff7e6d555e (diff) |
Fix clippy errors and upgrade Rust to 1.33.0 in CI (#1945)
Diffstat (limited to 'cli/resources.rs')
-rw-r--r-- | cli/resources.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cli/resources.rs b/cli/resources.rs index 2f07f0f11..385b3d5ca 100644 --- a/cli/resources.rs +++ b/cli/resources.rs @@ -451,8 +451,8 @@ pub fn seek( Some(Repr::FsFile(f)) => { let seek_from = match whence { 0 => SeekFrom::Start(offset as u64), - 1 => SeekFrom::Current(offset as i64), - 2 => SeekFrom::End(offset as i64), + 1 => SeekFrom::Current(i64::from(offset)), + 2 => SeekFrom::End(i64::from(offset)), _ => { return Box::new(futures::future::err(errors::new( errors::ErrorKind::InvalidSeekMode, @@ -481,14 +481,13 @@ pub fn seek( ))); } let mut std_file_copy = maybe_std_file_copy.unwrap(); - return Box::new(futures::future::lazy(move || { + Box::new(futures::future::lazy(move || { let result = std_file_copy .seek(seek_from) - .map(|_| { - return (); - }).map_err(DenoError::from); + .map(|_| {}) + .map_err(DenoError::from); futures::future::result(result) - })); + })) } _ => panic!("cannot seek"), } |