format

pop-os · Apr 16, 2021 · 22ee198 · 22ee198
1 parent 1adc209
commit 22ee198
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/daemon/mod.rs b/src/daemon/mod.rs
@@ -67,9 +67,9 @@ pub enum FgEvent {
 }
 
 pub struct LastKnown {
-    fetch: Result<(), ReleaseError>,
+    fetch:            Result<(), ReleaseError>,
     recovery_upgrade: Result<(), RecoveryError>,
-    release_upgrade: Result<(), ReleaseError>,
+    release_upgrade:  Result<(), ReleaseError>,
 }
 
 impl Default for LastKnown {
@@ -80,20 +80,20 @@ impl Default for LastKnown {
 
 pub struct ReleaseUpgradeState {
     action: release::UpgradeMethod,
-    from: Box<str>,
-    to: Box<str>,
+    from:   Box<str>,
+    to:     Box<str>,
 }
 
 pub struct Daemon {
-    event_tx: Sender<Event>,
-    fg_rx: Receiver<FgEvent>,
-    dbus_rx: Receiver<SignalEvent>,
-    connection: Arc<Connection>,
-    status: Arc<Atomic<DaemonStatus>>,
-    sub_status: Arc<Atomic<u8>>,
-    fetching_state: Arc<Atomic<(u64, u64)>>,
-    cancel: Arc<AtomicBool>,
-    last_known: LastKnown,
+    event_tx:        Sender<Event>,
+    fg_rx:           Receiver<FgEvent>,
+    dbus_rx:         Receiver<SignalEvent>,
+    connection:      Arc<Connection>,
+    status:          Arc<Atomic<DaemonStatus>>,
+    sub_status:      Arc<Atomic<u8>>,
+    fetching_state:  Arc<Atomic<(u64, u64)>>,
+    cancel:          Arc<AtomicBool>,
+    last_known:      LastKnown,
     release_upgrade: Option<ReleaseUpgradeState>,
     perform_upgrade: bool,
 }
@@ -628,8 +628,8 @@ impl Daemon {
 
         let event = Event::RecoveryUpgrade(RecoveryUpgradeMethod::FromRelease {
             version: if version.is_empty() { None } else { Some(version.into()) },
-            arch: if arch.is_empty() { None } else { Some(arch.into()) },
-            flags: RecoveryReleaseFlags::from_bits_truncate(flags),
+            arch:    if arch.is_empty() { None } else { Some(arch.into()) },
+            flags:   RecoveryReleaseFlags::from_bits_truncate(flags),
         });
 
         self.submit_event(event)

diff --git a/src/release/check.rs b/src/release/check.rs
@@ -125,12 +125,12 @@ fn next_(
             next = "21.04";
 
             ReleaseStatus {
-                build:   if development { release_check(next) } else { BuildStatus::Blacklisted },
+                build: if development { release_check(next) } else { BuildStatus::Blacklisted },
                 current: "20.10",
-                is_lts:  false,
+                is_lts: false,
                 next,
             }
-        },
+        }
 
         (21, 4) => ReleaseStatus {
             build:   BuildStatus::Blacklisted,