danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Merge pull request #520 from cole-h/fix-pedantry

Browse source 
*: fix pedantry
This commit is contained in:
Graham Christensen 2020-06-18 08:52:37 -04:00 committed by GitHub
parent 5cd1d0a884 f2c3dc3fa4
commit d7633725b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ofborg/build.rs
View file

@ -168,7 +168,7 @@ impl Metric {
MetricType::Ticker(Metric {
variant: parts.iter().cloned().collect(),
fields: fields
.unwrap_or_else(|| vec![])
.unwrap_or_default()
.iter()
.map(|(fieldname, fieldtype)| ((*fieldname).to_string(), (*fieldtype).to_string()))
.collect(),
@ -183,7 +183,7 @@ impl Metric {
MetricType::Counter(Metric {
variant: parts.iter().cloned().collect(),
fields: fields
.unwrap_or_else(|| vec![])
.unwrap_or_default()
.iter()
.map(|(fieldname, fieldtype)| ((*fieldname).to_string(), (*fieldtype).to_string()))
.collect(),

2
ofborg/src/bin/builder.rs
View file

@ -44,7 +44,7 @@ fn main() -> Result<(), Box<dyn Error>> {
})?;
let queue_name = if cfg.runner.build_all_jobs != Some(true) {
let queue_name = format!("build-inputs-{}", cfg.nix.system.clone());
let queue_name = format!("build-inputs-{}", cfg.nix.system);
chan.declare_queue(easyamqp::QueueConfig {
queue: queue_name.clone(),
passive: false,

2
ofborg/src/bin/mass-rebuilder.rs
View file

@ -39,7 +39,7 @@ fn main() -> Result<(), Box<dyn Error>> {
let nix = cfg.nix();
let events = stats::RabbitMQ::from_lapin(
&format!("{}-{}", cfg.runner.identity.clone(), cfg.nix.system.clone()),
&format!("{}-{}", cfg.runner.identity, cfg.nix.system),
task::block_on(conn.create_channel())?,
);

2
ofborg/src/bin/stats.rs
View file

@ -19,7 +19,7 @@ fn main() -> Result<(), Box<dyn Error>> {
let mut chan = task::block_on(conn.create_channel())?;
let events = stats::RabbitMQ::from_lapin(
&format!("{}-{}", cfg.runner.identity.clone(), cfg.nix.system.clone()),
&format!("{}-{}", cfg.runner.identity, cfg.nix.system),
task::block_on(conn.create_channel())?,
);

2
ofborg/src/message/buildjob.rs
View file

@ -32,7 +32,7 @@ impl BuildJob {
statusreport: Option<ExchangeQueue>,
request_id: String,
) -> BuildJob {
let logbackrk = format!("{}.{}", repo.full_name.clone(), pr.number,).to_lowercase();
let logbackrk = format!("{}.{}", repo.full_name, pr.number).to_lowercase();
BuildJob {
repo,