the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Fix upper_case_acronyms clippy lint

Browse source 
This is perhaps a bit controversial. The only acronym that I allowed is
the NixOS acronym all the others are required to follow the clippy
naming conventions.
This commit is contained in:
Andreas Rammhold 2021-05-16 18:26:06 +02:00 committed by Cole Helbling
parent 2d7758dc3b
commit 1b07e3afec
No known key found for this signature in database
GPG key ID: B37E0F2371016A4C
14 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ofborg/src/acl.rs
View file

@ -1,17 +1,17 @@
use crate::systems::System; use crate::systems::System;
pub struct ACL { pub struct Acl {
trusted_users: Option<Vec<String>>, trusted_users: Option<Vec<String>>,
repos: Vec<String>, repos: Vec<String>,
} }
impl ACL { impl Acl {
pub fn new(repos: Vec<String>, mut trusted_users: Option<Vec<String>>) -> ACL { pub fn new(repos: Vec<String>, mut trusted_users: Option<Vec<String>>) -> Acl {
if let Some(ref mut users) = trusted_users { if let Some(ref mut users) = trusted_users {
users.iter_mut().map(|x| *x = x.to_lowercase()).last(); users.iter_mut().map(|x| *x = x.to_lowercase()).last();
} }
ACL { Acl {
trusted_users, trusted_users,
repos, repos,
} }

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

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

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

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

1
ofborg/src/commentparser.rs
View file

@ -70,6 +70,7 @@ pub enum Instruction {
Eval, Eval,
} }
#[allow(clippy::upper_case_acronyms)]
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, PartialEq)]
pub enum Subset { pub enum Subset {
Nixpkgs, Nixpkgs,

4
ofborg/src/commitstatus.rs
View file

@ -74,7 +74,7 @@ impl<'a> CommitStatus<'a> {
#[derive(Debug)] #[derive(Debug)]
pub enum CommitStatusError { pub enum CommitStatusError {
ExpiredCreds(hubcaps::Error), ExpiredCreds(hubcaps::Error),
MissingSHA(hubcaps::Error), MissingSha(hubcaps::Error),
Error(hubcaps::Error), Error(hubcaps::Error),
} }
@ -91,7 +91,7 @@ impl From<hubcaps::Error> for CommitStatusError {
if code == &StatusCode::UnprocessableEntity if code == &StatusCode::UnprocessableEntity
&& error.message.starts_with("No commit found for SHA:") => && error.message.starts_with("No commit found for SHA:") =>
{ {
CommitStatusError::MissingSHA(e) CommitStatusError::MissingSha(e)
} }
_otherwise => CommitStatusError::Error(e), _otherwise => CommitStatusError::Error(e),
} }

10
ofborg/src/config.rs
View file

@ -18,7 +18,7 @@ pub struct Config {
pub feedback: FeedbackConfig, pub feedback: FeedbackConfig,
pub checkout: CheckoutConfig, pub checkout: CheckoutConfig,
pub nix: NixConfig, pub nix: NixConfig,
pub rabbitmq: RabbitMQConfig, pub rabbitmq: RabbitMqConfig,
pub github: Option<GithubConfig>, pub github: Option<GithubConfig>,
pub github_app: Option<GithubAppConfig>, pub github_app: Option<GithubAppConfig>,
pub log_storage: Option<LogStorage>, pub log_storage: Option<LogStorage>,
@ -30,7 +30,7 @@ pub struct FeedbackConfig {
} }
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
pub struct RabbitMQConfig { pub struct RabbitMqConfig {
pub ssl: bool, pub ssl: bool,
pub host: String, pub host: String,
pub virtualhost: Option<String>, pub virtualhost: Option<String>,
@ -89,7 +89,7 @@ impl Config {
format!("{}-{}", self.runner.identity, self.nix.system) format!("{}-{}", self.runner.identity, self.nix.system)
} }
pub fn acl(&self) -> acl::ACL { pub fn acl(&self) -> acl::Acl {
let repos = self let repos = self
.runner .runner
.repos .repos
@ -107,7 +107,7 @@ impl Config {
) )
}; };
acl::ACL::new(repos, trusted_users) acl::Acl::new(repos, trusted_users)
} }
pub fn github(&self) -> Github { pub fn github(&self) -> Github {
@ -142,7 +142,7 @@ impl Config {
} }
} }
impl RabbitMQConfig { impl RabbitMqConfig {
pub fn as_uri(&self) -> String { pub fn as_uri(&self) -> String {
format!( format!(
"{}://{}:{}@{}/{}", "{}://{}:{}@{}/{}",

4
ofborg/src/easylapin.rs
View file

@ -1,6 +1,6 @@
use std::pin::Pin; use std::pin::Pin;
use crate::config::RabbitMQConfig; use crate::config::RabbitMqConfig;
use crate::easyamqp::{ use crate::easyamqp::{
BindQueueConfig, ChannelExt, ConsumeConfig, ConsumerExt, ExchangeConfig, ExchangeType, BindQueueConfig, ChannelExt, ConsumeConfig, ConsumerExt, ExchangeConfig, ExchangeType,
QueueConfig, QueueConfig,
@ -21,7 +21,7 @@ use lapin::types::{AMQPValue, FieldTable};
use lapin::{BasicProperties, Channel, Connection, ConnectionProperties, ExchangeKind}; use lapin::{BasicProperties, Channel, Connection, ConnectionProperties, ExchangeKind};
use tracing::{debug, trace}; use tracing::{debug, trace};
pub fn from_config(cfg: &RabbitMQConfig) -> Result<Connection, lapin::Error> { pub fn from_config(cfg: &RabbitMqConfig) -> Result<Connection, lapin::Error> {
let mut props = FieldTable::default(); let mut props = FieldTable::default();
props.insert( props.insert(
"ofborg_version".into(), "ofborg_version".into(),

11
ofborg/src/nix.rs
View file

@ -13,6 +13,7 @@ use std::process::{Command, Stdio};
use tempfile::tempfile; use tempfile::tempfile;
#[allow(clippy::upper_case_acronyms)]
#[derive(Clone, Copy, Debug, PartialEq)] #[derive(Clone, Copy, Debug, PartialEq)]
pub enum File { pub enum File {
DefaultNixpkgs, DefaultNixpkgs,
@ -33,7 +34,7 @@ pub enum Operation {
Evaluate, Evaluate,
Instantiate, Instantiate,
Build, Build,
QueryPackagesJSON, QueryPackagesJson,
QueryPackagesOutputs, QueryPackagesOutputs,
NoOp { operation: Box<Operation> }, NoOp { operation: Box<Operation> },
Unknown { program: String }, Unknown { program: String },
@ -45,7 +46,7 @@ impl Operation {
Operation::Evaluate => Command::new("nix-instantiate"), Operation::Evaluate => Command::new("nix-instantiate"),
Operation::Instantiate => Command::new("nix-instantiate"), Operation::Instantiate => Command::new("nix-instantiate"),
Operation::Build => Command::new("nix-build"), Operation::Build => Command::new("nix-build"),
Operation::QueryPackagesJSON => Command::new("nix-env"), Operation::QueryPackagesJson => Command::new("nix-env"),
Operation::QueryPackagesOutputs => Command::new("nix-env"), Operation::QueryPackagesOutputs => Command::new("nix-env"),
Operation::NoOp { .. } => Command::new("echo"), Operation::NoOp { .. } => Command::new("echo"),
Operation::Unknown { ref program } => Command::new(program), Operation::Unknown { ref program } => Command::new(program),
@ -57,7 +58,7 @@ impl Operation {
Operation::Build => { Operation::Build => {
command.args(&["--no-out-link", "--keep-going"]); command.args(&["--no-out-link", "--keep-going"]);
} }
Operation::QueryPackagesJSON => { Operation::QueryPackagesJson => {
command.args(&["--query", "--available", "--json"]); command.args(&["--query", "--available", "--json"]);
} }
Operation::QueryPackagesOutputs => { Operation::QueryPackagesOutputs => {
@ -85,7 +86,7 @@ impl fmt::Display for Operation {
match *self { match *self {
Operation::Build => write!(f, "nix-build"), Operation::Build => write!(f, "nix-build"),
Operation::Instantiate => write!(f, "nix-instantiate"), Operation::Instantiate => write!(f, "nix-instantiate"),
Operation::QueryPackagesJSON => write!(f, "nix-env -qa --json"), Operation::QueryPackagesJson => write!(f, "nix-env -qa --json"),
Operation::QueryPackagesOutputs => write!(f, "nix-env -qaP --no-name --out-path"), Operation::QueryPackagesOutputs => write!(f, "nix-env -qaP --no-name --out-path"),
Operation::NoOp { ref operation } => operation.fmt(f), Operation::NoOp { ref operation } => operation.fmt(f),
Operation::Unknown { ref program } => write!(f, "{}", program), Operation::Unknown { ref program } => write!(f, "{}", program),
@ -556,7 +557,7 @@ mod tests {
#[test] #[test]
fn test_query_packages_json() { fn test_query_packages_json() {
let nix = nix(); let nix = nix();
let op = noop(Operation::QueryPackagesJSON); let op = noop(Operation::QueryPackagesJson);
assert_eq!(op.to_string(), "nix-env -qa --json"); assert_eq!(op.to_string(), "nix-env -qa --json");
let ret: Result<fs::File, fs::File> = nix.run( let ret: Result<fs::File, fs::File> = nix.run(

8
ofborg/src/stats.rs
View file

@ -19,21 +19,21 @@ pub struct EventMessage {
pub events: Vec<Event>, pub events: Vec<Event>,
} }
pub struct RabbitMQ<C> { pub struct RabbitMq<C> {
identity: String, identity: String,
channel: C, channel: C,
} }
impl RabbitMQ<lapin::Channel> { impl RabbitMq<lapin::Channel> {
pub fn from_lapin(identity: &str, channel: lapin::Channel) -> Self { pub fn from_lapin(identity: &str, channel: lapin::Channel) -> Self {
RabbitMQ { RabbitMq {
identity: identity.to_owned(), identity: identity.to_owned(),
channel, channel,
} }
} }
} }
impl SysEvents for RabbitMQ<lapin::Channel> { impl SysEvents for RabbitMq<lapin::Channel> {
fn notify(&mut self, event: Event) { fn notify(&mut self, event: Event) {
let props = lapin::BasicProperties::default().with_content_type("application/json".into()); let props = lapin::BasicProperties::default().with_content_type("application/json".into());
task::block_on(async { task::block_on(async {

12
ofborg/src/tagger.rs
View file

@ -235,14 +235,14 @@ impl RebuildTagger {
} }
} }
pub struct MaintainerPRTagger { pub struct MaintainerPrTagger {
possible: Vec<String>, possible: Vec<String>,
selected: Vec<String>, selected: Vec<String>,
} }
impl Default for MaintainerPRTagger { impl Default for MaintainerPrTagger {
fn default() -> MaintainerPRTagger { fn default() -> MaintainerPrTagger {
let mut t = MaintainerPRTagger { let mut t = MaintainerPrTagger {
possible: vec![String::from("11.by: package-maintainer")], possible: vec![String::from("11.by: package-maintainer")],
selected: vec![], selected: vec![],
}; };
@ -252,8 +252,8 @@ impl Default for MaintainerPRTagger {
} }
} }
impl MaintainerPRTagger { impl MaintainerPrTagger {
pub fn new() -> MaintainerPRTagger { pub fn new() -> MaintainerPrTagger {
Default::default() Default::default()
} }

8
ofborg/src/tasks/eval/nixpkgs.rs
View file

@ -8,7 +8,7 @@ use crate::message::evaluationjob::EvaluationJob;
use crate::nix::{self, Nix}; use crate::nix::{self, Nix};
use crate::nixenv::HydraNixEnv; use crate::nixenv::HydraNixEnv;
use crate::outpathdiff::{OutPathDiff, PackageArch}; use crate::outpathdiff::{OutPathDiff, PackageArch};
use crate::tagger::{MaintainerPRTagger, PkgsAddedRemovedTagger, RebuildTagger, StdenvTagger}; use crate::tagger::{MaintainerPrTagger, PkgsAddedRemovedTagger, RebuildTagger, StdenvTagger};
use crate::tasks::eval::{ use crate::tasks::eval::{
stdenvs::Stdenvs, Error, EvaluationComplete, EvaluationStrategy, StepResult, stdenvs::Stdenvs, Error, EvaluationComplete, EvaluationStrategy, StepResult,
}; };
@ -279,7 +279,7 @@ impl<'a> NixpkgsStrategy<'a> {
if let Ok(ref maint) = m { if let Ok(ref maint) = m {
request_reviews(&maint, &self.pull); request_reviews(&maint, &self.pull);
let mut maint_tagger = MaintainerPRTagger::new(); let mut maint_tagger = MaintainerPrTagger::new();
maint_tagger maint_tagger
.record_maintainer(&self.issue.user.login, &maint.maintainers_by_package()); .record_maintainer(&self.issue.user.login, &maint.maintainers_by_package());
update_labels( update_labels(
@ -423,13 +423,13 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![ vec![
EvalChecker::new( EvalChecker::new(
"package-list", "package-list",
nix::Operation::QueryPackagesJSON, nix::Operation::QueryPackagesJson,
vec![String::from("--file"), String::from(".")], vec![String::from("--file"), String::from(".")],
self.nix.clone(), self.nix.clone(),
), ),
EvalChecker::new( EvalChecker::new(
"package-list-no-aliases", "package-list-no-aliases",
nix::Operation::QueryPackagesJSON, nix::Operation::QueryPackagesJson,
vec![ vec![
String::from("--file"), String::from("--file"),
String::from("."), String::from("."),

12
ofborg/src/tasks/evaluate.rs
View file

@ -1,5 +1,5 @@
/// This is what evaluates every pull-request /// This is what evaluates every pull-request
use crate::acl::ACL; use crate::acl::Acl;
use crate::checkout; use crate::checkout;
use crate::commitstatus::{CommitStatus, CommitStatusError}; use crate::commitstatus::{CommitStatus, CommitStatusError};
use crate::config::GithubAppVendingMachine; use crate::config::GithubAppVendingMachine;
@ -26,7 +26,7 @@ pub struct EvaluationWorker<E> {
nix: nix::Nix, nix: nix::Nix,
github: hubcaps::Github, github: hubcaps::Github,
github_vend: RwLock<GithubAppVendingMachine>, github_vend: RwLock<GithubAppVendingMachine>,
acl: ACL, acl: Acl,
identity: String, identity: String,
events: E, events: E,
} }
@ -55,7 +55,7 @@ impl<E: stats::SysEvents> EvaluationWorker<E> {
nix: &nix::Nix, nix: &nix::Nix,
github: hubcaps::Github, github: hubcaps::Github,
github_vend: GithubAppVendingMachine, github_vend: GithubAppVendingMachine,
acl: ACL, acl: Acl,
identity: String, identity: String,
events: E, events: E,
) -> EvaluationWorker<E> { ) -> EvaluationWorker<E> {
@ -125,7 +125,7 @@ struct OneEval<'a, E> {
repo: hubcaps::repositories::Repository<'a>, repo: hubcaps::repositories::Repository<'a>,
gists: Gists<'a>, gists: Gists<'a>,
nix: &'a nix::Nix, nix: &'a nix::Nix,
acl: &'a ACL, acl: &'a Acl,
events: &'a mut E, events: &'a mut E,
identity: &'a str, identity: &'a str,
cloner: &'a checkout::CachedCloner, cloner: &'a checkout::CachedCloner,
@ -138,7 +138,7 @@ impl<'a, E: stats::SysEvents + 'static> OneEval<'a, E> {
client_app: &'a hubcaps::Github, client_app: &'a hubcaps::Github,
client_legacy: &'a hubcaps::Github, client_legacy: &'a hubcaps::Github,
nix: &'a nix::Nix, nix: &'a nix::Nix,
acl: &'a ACL, acl: &'a Acl,
events: &'a mut E, events: &'a mut E,
identity: &'a str, identity: &'a str,
cloner: &'a checkout::CachedCloner, cloner: &'a checkout::CachedCloner,
@ -242,7 +242,7 @@ impl<'a, E: stats::SysEvents + 'static> OneEval<'a, E> {
error!("Failed writing commit status: creds expired: {:?}", e); error!("Failed writing commit status: creds expired: {:?}", e);
self.actions().retry_later(&self.job) self.actions().retry_later(&self.job)
} }
Err(Err(CommitStatusError::MissingSHA(e))) => { Err(Err(CommitStatusError::MissingSha(e))) => {
error!( error!(
"Failed writing commit status: commit sha was force-pushed away: {:?}", "Failed writing commit status: commit sha was force-pushed away: {:?}",
e e

6
ofborg/src/tasks/evaluationfilter.rs
View file

@ -6,11 +6,11 @@ use crate::worker;
use tracing::{debug_span, info}; use tracing::{debug_span, info};
pub struct EvaluationFilterWorker { pub struct EvaluationFilterWorker {
acl: acl::ACL, acl: acl::Acl,
} }
impl EvaluationFilterWorker { impl EvaluationFilterWorker {
pub fn new(acl: acl::ACL) -> EvaluationFilterWorker { pub fn new(acl: acl::Acl) -> EvaluationFilterWorker {
EvaluationFilterWorker { acl } EvaluationFilterWorker { acl }
} }
} }
@ -110,7 +110,7 @@ mod tests {
let job: ghevent::PullRequestEvent = let job: ghevent::PullRequestEvent =
serde_json::from_str(&data.to_string()).expect("Should properly deserialize"); serde_json::from_str(&data.to_string()).expect("Should properly deserialize");
let mut worker = EvaluationFilterWorker::new(acl::ACL::new( let mut worker = EvaluationFilterWorker::new(acl::Acl::new(
vec!["nixos/nixpkgs".to_owned()], vec!["nixos/nixpkgs".to_owned()],
Some(vec![]), Some(vec![]),
)); ));

4
ofborg/src/tasks/githubcommentfilter.rs
View file

@ -8,12 +8,12 @@ use tracing::{debug_span, error, info};
use uuid::Uuid; use uuid::Uuid;
pub struct GitHubCommentWorker { pub struct GitHubCommentWorker {
acl: acl::ACL, acl: acl::Acl,
github: hubcaps::Github, github: hubcaps::Github,
} }
impl GitHubCommentWorker { impl GitHubCommentWorker {
pub fn new(acl: acl::ACL, github: hubcaps::Github) -> GitHubCommentWorker { pub fn new(acl: acl::Acl, github: hubcaps::Github) -> GitHubCommentWorker {
GitHubCommentWorker { acl, github } GitHubCommentWorker { acl, github }
} }
} }