From 60dc278f4cdfdb607006051c88b6bace2cb4421e Mon Sep 17 00:00:00 2001 From: Alberto Planas Date: Wed, 13 Nov 2019 11:51:52 +0100 Subject: [PATCH] Remove unnecessary parentheses around type Fix a compilation error in nightly, and a future error in stable. --- kanidmd/src/lib/audit.rs | 1 - kanidmd/src/lib/core.rs | 4 ++-- kanidmd/src/lib/entry.rs | 2 +- kanidmd/src/lib/plugins/base.rs | 3 +-- kanidmd/src/lib/plugins/mod.rs | 32 ++++++++++++++++---------------- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/kanidmd/src/lib/audit.rs b/kanidmd/src/lib/audit.rs index 009764b78..4ab209c85 100644 --- a/kanidmd/src/lib/audit.rs +++ b/kanidmd/src/lib/audit.rs @@ -174,5 +174,4 @@ mod tests { let d = serde_json::to_string_pretty(&au).expect("Json serialise failure"); println!("{}", d); } - } diff --git a/kanidmd/src/lib/core.rs b/kanidmd/src/lib/core.rs index 32194e39b..2f8c0a6ef 100644 --- a/kanidmd/src/lib/core.rs +++ b/kanidmd/src/lib/core.rs @@ -113,7 +113,7 @@ macro_rules! json_event_post { match r_obj { Ok(obj) => { // combine request + uat -> message. - let m_obj = <($message_type)>::new(uat, obj); + let m_obj = <$message_type>::new(uat, obj); let res = $dest .send(m_obj) // What is from_err? @@ -143,7 +143,7 @@ macro_rules! json_event_get { let uat = get_current_user(&$req); // New event, feed current auth data from the token to it. - let obj = <($message_type)>::new(uat); + let obj = <$message_type>::new(uat); let res = $state.qe_r.send(obj).from_err().and_then(|res| match res { Ok(event_result) => Ok(HttpResponse::Ok().json(event_result)), diff --git a/kanidmd/src/lib/entry.rs b/kanidmd/src/lib/entry.rs index d21aac91d..8678804c6 100644 --- a/kanidmd/src/lib/entry.rs +++ b/kanidmd/src/lib/entry.rs @@ -67,7 +67,7 @@ impl<'a> Iterator for EntryClasses<'a> { type Item = &'a Value; #[inline] - fn next(&mut self) -> Option<(&'a Value)> { + fn next(&mut self) -> Option<&'a Value> { match self.inner.iter_mut().next() { Some(i) => i.next(), None => None, diff --git a/kanidmd/src/lib/plugins/base.rs b/kanidmd/src/lib/plugins/base.rs index 2bf9b8ce9..c662fc984 100644 --- a/kanidmd/src/lib/plugins/base.rs +++ b/kanidmd/src/lib/plugins/base.rs @@ -482,8 +482,7 @@ mod tests { "uuid": ["79724141-3603-4060-b6bb-35c72772611d", "79724141-3603-4060-b6bb-35c72772611e"] } }"#, - ) - ; + ); let create = vec![e.clone()]; diff --git a/kanidmd/src/lib/plugins/mod.rs b/kanidmd/src/lib/plugins/mod.rs index b16c1f78a..092e9f334 100644 --- a/kanidmd/src/lib/plugins/mod.rs +++ b/kanidmd/src/lib/plugins/mod.rs @@ -119,8 +119,8 @@ macro_rules! run_pre_create_transform_plugin { $ce:ident, $target_plugin:ty ) => {{ - let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); - let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_create_transform( + let mut audit_scope = AuditScope::new(<$target_plugin>::id()); + let r = audit_segment!(audit_scope, || <$target_plugin>::pre_create_transform( &mut audit_scope, $qs, $cand, @@ -139,8 +139,8 @@ macro_rules! run_pre_create_plugin { $ce:ident, $target_plugin:ty ) => {{ - let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); - let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_create( + let mut audit_scope = AuditScope::new(<$target_plugin>::id()); + let r = audit_segment!(audit_scope, || <$target_plugin>::pre_create( &mut audit_scope, $qs, $cand, @@ -159,8 +159,8 @@ macro_rules! run_post_create_plugin { $ce:ident, $target_plugin:ty ) => {{ - let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); - let r = audit_segment!(audit_scope, || <($target_plugin)>::post_create( + let mut audit_scope = AuditScope::new(<$target_plugin>::id()); + let r = audit_segment!(audit_scope, || <$target_plugin>::post_create( &mut audit_scope, $qs, $cand, @@ -179,8 +179,8 @@ macro_rules! run_pre_modify_plugin { $ce:ident, $target_plugin:ty ) => {{ - let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); - let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_modify( + let mut audit_scope = AuditScope::new(<$target_plugin>::id()); + let r = audit_segment!(audit_scope, || <$target_plugin>::pre_modify( &mut audit_scope, $qs, $cand, @@ -200,8 +200,8 @@ macro_rules! run_post_modify_plugin { $ce:ident, $target_plugin:ty ) => {{ - let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); - let r = audit_segment!(audit_scope, || <($target_plugin)>::post_modify( + let mut audit_scope = AuditScope::new(<$target_plugin>::id()); + let r = audit_segment!(audit_scope, || <$target_plugin>::post_modify( &mut audit_scope, $qs, $pre_cand, @@ -221,8 +221,8 @@ macro_rules! run_pre_delete_plugin { $ce:ident, $target_plugin:ty ) => {{ - let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); - let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_delete( + let mut audit_scope = AuditScope::new(<$target_plugin>::id()); + let r = audit_segment!(audit_scope, || <$target_plugin>::pre_delete( &mut audit_scope, $qs, $cand, @@ -241,8 +241,8 @@ macro_rules! run_post_delete_plugin { $ce:ident, $target_plugin:ty ) => {{ - let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); - let r = audit_segment!(audit_scope, || <($target_plugin)>::post_delete( + let mut audit_scope = AuditScope::new(<$target_plugin>::id()); + let r = audit_segment!(audit_scope, || <$target_plugin>::post_delete( &mut audit_scope, $qs, $cand, @@ -260,8 +260,8 @@ macro_rules! run_verify_plugin { $results:expr, $target_plugin:ty ) => {{ - let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); - let mut r = audit_segment!(audit_scope, || <($target_plugin)>::verify( + let mut audit_scope = AuditScope::new(<$target_plugin>::id()); + let mut r = audit_segment!(audit_scope, || <$target_plugin>::verify( &mut audit_scope, $qs, ));