mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unnecessary parentheses around type

Browse source 
Fix a compilation error in nightly, and a future error in stable.
This commit is contained in:
Alberto Planas 2019-11-13 11:51:52 +01:00 committed by Firstyear
parent 5049eac1e4
commit 60dc278f4c
5 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kanidmd/src/lib/audit.rs
View file

@ -174,5 +174,4 @@ mod tests {
let d = serde_json::to_string_pretty(&au).expect("Json serialise failure"); let d = serde_json::to_string_pretty(&au).expect("Json serialise failure");
println!("{}", d); println!("{}", d);
} }
} }

4
kanidmd/src/lib/core.rs
View file

@ -113,7 +113,7 @@ macro_rules! json_event_post {
match r_obj { match r_obj {
Ok(obj) => { Ok(obj) => {
// combine request + uat -> message. // combine request + uat -> message.
let m_obj = <($message_type)>::new(uat, obj); let m_obj = <$message_type>::new(uat, obj);
let res = $dest let res = $dest
.send(m_obj) .send(m_obj)
// What is from_err? // What is from_err?
@ -143,7 +143,7 @@ macro_rules! json_event_get {
let uat = get_current_user(&$req); let uat = get_current_user(&$req);
// New event, feed current auth data from the token to it. // 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 { let res = $state.qe_r.send(obj).from_err().and_then(|res| match res {
Ok(event_result) => Ok(HttpResponse::Ok().json(event_result)), Ok(event_result) => Ok(HttpResponse::Ok().json(event_result)),

2
kanidmd/src/lib/entry.rs
View file

@ -67,7 +67,7 @@ impl<'a> Iterator for EntryClasses<'a> {
type Item = &'a Value; type Item = &'a Value;
#[inline] #[inline]
fn next(&mut self) -> Option<(&'a Value)> { fn next(&mut self) -> Option<&'a Value> {
match self.inner.iter_mut().next() { match self.inner.iter_mut().next() {
Some(i) => i.next(), Some(i) => i.next(),
None => None, None => None,

3
kanidmd/src/lib/plugins/base.rs
View file

@ -482,8 +482,7 @@ mod tests {
"uuid": ["79724141-3603-4060-b6bb-35c72772611d", "79724141-3603-4060-b6bb-35c72772611e"] "uuid": ["79724141-3603-4060-b6bb-35c72772611d", "79724141-3603-4060-b6bb-35c72772611e"]
} }
}"#, }"#,
) );
;
let create = vec![e.clone()]; let create = vec![e.clone()];

32
kanidmd/src/lib/plugins/mod.rs
View file

@ -119,8 +119,8 @@ macro_rules! run_pre_create_transform_plugin {
$ce:ident, $ce:ident,
$target_plugin:ty $target_plugin:ty
) => {{ ) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); let mut audit_scope = AuditScope::new(<$target_plugin>::id());
let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_create_transform( let r = audit_segment!(audit_scope, || <$target_plugin>::pre_create_transform(
&mut audit_scope, &mut audit_scope,
$qs, $qs,
$cand, $cand,
@ -139,8 +139,8 @@ macro_rules! run_pre_create_plugin {
$ce:ident, $ce:ident,
$target_plugin:ty $target_plugin:ty
) => {{ ) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); let mut audit_scope = AuditScope::new(<$target_plugin>::id());
let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_create( let r = audit_segment!(audit_scope, || <$target_plugin>::pre_create(
&mut audit_scope, &mut audit_scope,
$qs, $qs,
$cand, $cand,
@ -159,8 +159,8 @@ macro_rules! run_post_create_plugin {
$ce:ident, $ce:ident,
$target_plugin:ty $target_plugin:ty
) => {{ ) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); let mut audit_scope = AuditScope::new(<$target_plugin>::id());
let r = audit_segment!(audit_scope, || <($target_plugin)>::post_create( let r = audit_segment!(audit_scope, || <$target_plugin>::post_create(
&mut audit_scope, &mut audit_scope,
$qs, $qs,
$cand, $cand,
@ -179,8 +179,8 @@ macro_rules! run_pre_modify_plugin {
$ce:ident, $ce:ident,
$target_plugin:ty $target_plugin:ty
) => {{ ) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); let mut audit_scope = AuditScope::new(<$target_plugin>::id());
let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_modify( let r = audit_segment!(audit_scope, || <$target_plugin>::pre_modify(
&mut audit_scope, &mut audit_scope,
$qs, $qs,
$cand, $cand,
@ -200,8 +200,8 @@ macro_rules! run_post_modify_plugin {
$ce:ident, $ce:ident,
$target_plugin:ty $target_plugin:ty
) => {{ ) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); let mut audit_scope = AuditScope::new(<$target_plugin>::id());
let r = audit_segment!(audit_scope, || <($target_plugin)>::post_modify( let r = audit_segment!(audit_scope, || <$target_plugin>::post_modify(
&mut audit_scope, &mut audit_scope,
$qs, $qs,
$pre_cand, $pre_cand,
@ -221,8 +221,8 @@ macro_rules! run_pre_delete_plugin {
$ce:ident, $ce:ident,
$target_plugin:ty $target_plugin:ty
) => {{ ) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); let mut audit_scope = AuditScope::new(<$target_plugin>::id());
let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_delete( let r = audit_segment!(audit_scope, || <$target_plugin>::pre_delete(
&mut audit_scope, &mut audit_scope,
$qs, $qs,
$cand, $cand,
@ -241,8 +241,8 @@ macro_rules! run_post_delete_plugin {
$ce:ident, $ce:ident,
$target_plugin:ty $target_plugin:ty
) => {{ ) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); let mut audit_scope = AuditScope::new(<$target_plugin>::id());
let r = audit_segment!(audit_scope, || <($target_plugin)>::post_delete( let r = audit_segment!(audit_scope, || <$target_plugin>::post_delete(
&mut audit_scope, &mut audit_scope,
$qs, $qs,
$cand, $cand,
@ -260,8 +260,8 @@ macro_rules! run_verify_plugin {
$results:expr, $results:expr,
$target_plugin:ty $target_plugin:ty
) => {{ ) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id()); let mut audit_scope = AuditScope::new(<$target_plugin>::id());
let mut r = audit_segment!(audit_scope, || <($target_plugin)>::verify( let mut r = audit_segment!(audit_scope, || <$target_plugin>::verify(
&mut audit_scope, &mut audit_scope,
$qs, $qs,
)); ));