fmt after rebase

client/src/lib.rs

@@ -2738,9 +2738,7 @@ impl Client {
         // Clear pending trade
         self.pending_trade = None;
 
-        let client_uid = self
-            .uid()
-            .expect("Client doesn't have a Uid!!!");
+        let client_uid = self.uid().expect("Client doesn't have a Uid!!!");
 
         // Clear ecs of all entities
         self.state.ecs_mut().delete_all();

voxygen/src/session/interactable.rs

@@ -14,7 +14,7 @@ use common::{
     link::Is,
     mounting::{Mount, Rider, VolumePos, VolumeRider},
     terrain::{Block, TerrainGrid, UnlockKind},
-    uid::{Uid, IdMaps},
+    uid::{IdMaps, Uid},
     util::find_dist::{Cube, Cylinder, FindDist},
     vol::ReadVol,
     CachedSpatialGrid,