Skip to content
Snippets Groups Projects
Commit 2c349104 authored by nanocryk's avatar nanocryk
Browse files

Merge branch 'ci' into 'dev'

Apply rustfmt diff in gitlab-CI

See merge request !6
parents f072fe69 c84ff91c
No related branches found
No related tags found
1 merge request!6Apply rustfmt diff in gitlab-CI
stages: stages:
- builds - builds
- tests - tests
- fmt
before_script: before_script:
- export PATH="$HOME/.cargo/bin:$PATH" - export PATH="$HOME/.cargo/bin:$PATH"
...@@ -18,3 +19,13 @@ tests: ...@@ -18,3 +19,13 @@ tests:
- redshift-rs - redshift-rs
script: script:
- cargo test - cargo test
fmt:
stage: fmt
tags:
- redshift-rs-nightly
before_script:
- export PATH="$HOME/.cargo/bin:$PATH"
- cargo install --force rustfmt-nightly
script:
- cargo fmt -- --write-mode=diff
...@@ -23,17 +23,14 @@ ...@@ -23,17 +23,14 @@
//! [Duniter]: https://duniter.org/ //! [Duniter]: https://duniter.org/
//! [js-tests]: https://github.com/duniter/wotb/blob/master/wotcpp/webOfTrust.cpp //! [js-tests]: https://github.com/duniter/wotb/blob/master/wotcpp/webOfTrust.cpp
#![deny(missing_docs, #![deny(missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
missing_debug_implementations, missing_copy_implementations, trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
trivial_casts, trivial_numeric_casts, unused_qualifications)]
unsafe_code,
unstable_features,
unused_import_braces, unused_qualifications)]
extern crate bincode;
extern crate serde; extern crate serde;
#[macro_use] #[macro_use]
extern crate serde_derive; extern crate serde_derive;
extern crate bincode;
use std::collections::HashSet; use std::collections::HashSet;
use std::collections::hash_set::Iter; use std::collections::hash_set::Iter;
...@@ -41,7 +38,7 @@ use std::rc::Rc; ...@@ -41,7 +38,7 @@ use std::rc::Rc;
use std::fs::File; use std::fs::File;
use std::io::prelude::*; use std::io::prelude::*;
use bincode::{serialize, deserialize, Infinite}; use bincode::{deserialize, serialize, Infinite};
/// Wrapper for a node id. /// Wrapper for a node id.
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
...@@ -286,9 +283,7 @@ impl WebOfTrust { ...@@ -286,9 +283,7 @@ impl WebOfTrust {
let mut sentries: Vec<bool> = self.nodes let mut sentries: Vec<bool> = self.nodes
.iter() .iter()
.map(|x| { .map(|x| x.enabled && x.issued_count() >= d_min && x.links_iter().count() >= d_min)
x.enabled && x.issued_count() >= d_min && x.links_iter().count() >= d_min
})
.collect(); .collect();
sentries[member.0] = false; sentries[member.0] = false;
...@@ -318,9 +313,7 @@ impl WebOfTrust { ...@@ -318,9 +313,7 @@ impl WebOfTrust {
pub fn get_sentries(&self, d_min: usize) -> Vec<NodeId> { pub fn get_sentries(&self, d_min: usize) -> Vec<NodeId> {
self.nodes self.nodes
.iter() .iter()
.filter(|x| { .filter(|x| x.enabled && x.issued_count() >= d_min && x.links_iter().count() >= d_min)
x.enabled && x.issued_count() >= d_min && x.links_iter().count() >= d_min
})
.map(|x| x.id()) .map(|x| x.id())
.collect() .collect()
} }
...@@ -329,9 +322,7 @@ impl WebOfTrust { ...@@ -329,9 +322,7 @@ impl WebOfTrust {
pub fn get_non_sentries(&self, d_min: usize) -> Vec<NodeId> { pub fn get_non_sentries(&self, d_min: usize) -> Vec<NodeId> {
self.nodes self.nodes
.iter() .iter()
.filter(|x| { .filter(|x| x.enabled && (x.issued_count < d_min || x.links_iter().count() < d_min))
x.enabled && (x.issued_count < d_min || x.links_iter().count() < d_min)
})
.map(|x| x.id()) .map(|x| x.id())
.collect() .collect()
} }
...@@ -818,6 +809,5 @@ mod tests { ...@@ -818,6 +809,5 @@ mod tests {
wot2.get_non_sentries(1).len() wot2.get_non_sentries(1).len()
); );
} }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment