mirror of
https://github.com/NLnetLabs/krill.git
synced 2026-09-22 17:34:56 +02:00
Fixing clippy warnings. Just a few ;)
This commit is contained in:
@@ -56,6 +56,7 @@ impl PublishDelta {
|
||||
|
||||
//------------ PublishDeltaBuilder -------------------------------------------
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct PublishDeltaBuilder {
|
||||
publishes: Vec<Publish>,
|
||||
updates: Vec<Update>,
|
||||
@@ -64,11 +65,7 @@ pub struct PublishDeltaBuilder {
|
||||
|
||||
impl PublishDeltaBuilder {
|
||||
pub fn new() -> Self {
|
||||
PublishDeltaBuilder {
|
||||
publishes: vec![],
|
||||
updates: vec![],
|
||||
withdraws: vec![]
|
||||
}
|
||||
Self::default()
|
||||
}
|
||||
|
||||
pub fn add_publish(&mut self, publish: Publish) {
|
||||
|
||||
@@ -36,7 +36,7 @@ impl CmsAuthData {
|
||||
|
||||
impl CmsAuthData {
|
||||
pub fn new(tag: Option<String>, id_cert: IdCert) -> Self {
|
||||
let tag = tag.unwrap_or("".to_string());
|
||||
let tag = tag.unwrap_or_else(String::new);
|
||||
CmsAuthData { tag, id_cert }
|
||||
}
|
||||
}
|
||||
@@ -162,7 +162,7 @@ pub struct PublisherList<'a> {
|
||||
|
||||
impl<'a> PublisherList<'a> {
|
||||
pub fn from(
|
||||
publishers: &'a Vec<Arc<Publisher>>,
|
||||
publishers: &'a[Arc<Publisher>],
|
||||
path_publishers: &'a str
|
||||
) -> PublisherList<'a> {
|
||||
let publishers: Vec<PublisherSummaryInfo> = publishers.iter().map(|p|
|
||||
|
||||
+7
-11
@@ -12,8 +12,8 @@ use crate::util::file::{self, RecursorError};
|
||||
use crate::util::ext_serde;
|
||||
use util::sha256;
|
||||
|
||||
const VERSION: &'static str = "1";
|
||||
const NS: &'static str = "http://www.ripe.net/rpki/rrdp";
|
||||
const VERSION: &str = "1";
|
||||
const NS: &str = "http://www.ripe.net/rpki/rrdp";
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, Eq, Serialize, PartialEq)]
|
||||
pub struct PublishedObject {
|
||||
@@ -78,7 +78,7 @@ impl Snapshot {
|
||||
Some(&a),
|
||||
|w| {
|
||||
for uri in self.objects.keys() {
|
||||
let objects = self.objects.get(uri).unwrap();
|
||||
let objects = &self.objects[uri];
|
||||
for cf in objects {
|
||||
let uri = cf.uri.to_string();
|
||||
let a = [ ("uri", uri.as_ref()) ];
|
||||
@@ -401,6 +401,7 @@ impl FileInfo {
|
||||
|
||||
//------------ NotificationBuilder -------------------------------------------
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct NotificationBuilder {
|
||||
serial: Option<usize>,
|
||||
session_id: Option<String>,
|
||||
@@ -410,12 +411,7 @@ pub struct NotificationBuilder {
|
||||
|
||||
impl NotificationBuilder {
|
||||
pub fn new() -> Self {
|
||||
NotificationBuilder {
|
||||
serial: None,
|
||||
session_id: None,
|
||||
snapshot: None,
|
||||
deltas: Vec::new()
|
||||
}
|
||||
Self::default()
|
||||
}
|
||||
|
||||
pub fn with_serial(&mut self, serial: usize) {
|
||||
@@ -457,8 +453,8 @@ impl NotificationBuilder {
|
||||
let mut count = 0;
|
||||
|
||||
self.deltas.retain(|d| {
|
||||
count = count + 1;
|
||||
total_deltas = total_deltas + d.size;
|
||||
count += 1;
|
||||
total_deltas += d.size;
|
||||
count <= 2 || total_deltas < size_snapshot
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user