Simplify use of adapters, given there is only the default
This makes it simpler to implement the per-change adapter later by clearing away some existing mess.
3 files changed
+51
-126
c89b471f
→
2e37eb04
modified src/bin/cib.rs
@@ -13,7 +13,6 @@ use clap::Parser;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -173,18 +172,11 @@ impl QueuedCmd {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -268,18 +260,10 @@ impl ProcessEventsCmd {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -338,8 +322,8 @@ enum CibError {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified src/broker.rs
@@ -4,7 +4,6 @@
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -29,19 +28,21 @@ use crate::{
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -52,16 +53,8 @@ impl Broker {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -72,8 +65,7 @@ impl Broker {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -201,7 +193,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -209,58 +201,17 @@ mod test {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -278,8 +229,7 @@ echo '{"response":"finished","result":"success"}'
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -311,8 +261,7 @@ exit 1
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
modified src/config.rs
@@ -2,7 +2,6 @@
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -10,7 +9,7 @@ use std::{
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -18,7 +17,7 @@ const DEFAULT_STATUS_PAGE_UPDATE_INTERVAL: u64 = 10;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -56,16 +55,12 @@ impl Config {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -90,30 +85,15 @@ impl Config {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -123,6 +103,14 @@ impl Adapter {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -137,6 +125,10 @@ pub enum ConfigError {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|