From 899951742100b83743ef9f65fbb161454ef4bfa7 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Fri, 3 May 2019 02:37:02 +0200 Subject: core,cli: fix clippy warnings --- core/isolate.rs | 4 +++- core/modules.rs | 6 ++---- core/shared_queue.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core') diff --git a/core/isolate.rs b/core/isolate.rs index 96d9dc24b..b51b7fe47 100644 --- a/core/isolate.rs +++ b/core/isolate.rs @@ -50,9 +50,11 @@ pub enum StartupData<'a> { None, } +type DispatchFn = Fn(&[u8], Option) -> Op; + #[derive(Default)] pub struct Config { - dispatch: Option) -> Op>>, + dispatch: Option>, pub will_snapshot: bool, } diff --git a/core/modules.rs b/core/modules.rs index c634a5aa6..0e7cc68aa 100644 --- a/core/modules.rs +++ b/core/modules.rs @@ -200,7 +200,7 @@ impl Future for RecursiveLoad { modules.is_registered(&source_code_info.module_name) }; - let need_alias = &source_code_info.module_name != &completed.url; + let need_alias = source_code_info.module_name != completed.url; if !is_module_registered { let module_name = &source_code_info.module_name; @@ -418,9 +418,7 @@ impl Modules { let name = String::from(name); debug!("register_complete {}", name); - let _r = self.by_name.insert(name.clone(), id); - // TODO should this be an assert or not ? assert!(r.is_none()); - + self.by_name.insert(name.clone(), id); self.info.insert( id, ModuleInfo { diff --git a/core/shared_queue.rs b/core/shared_queue.rs index af19cfc6f..c33a37b90 100644 --- a/core/shared_queue.rs +++ b/core/shared_queue.rs @@ -95,7 +95,7 @@ impl SharedQueue { fn num_shifted_off(&self) -> usize { let s = self.as_u32_slice(); - return s[INDEX_NUM_SHIFTED_OFF] as usize; + s[INDEX_NUM_SHIFTED_OFF] as usize } fn set_end(&mut self, index: usize, end: usize) { -- cgit v1.2.3