Rewrite protos and disable rustfmt on them

server/src/games/config.rs

@@ -77,8 +77,7 @@ impl Config {
 			let folder = folder.clone();
 			tokio::task::spawn_blocking(|| cache_image(p, folder));
 		}
-		for 
+		for Card {
-			Card {
 			image,
 			back_image,
 			other: _,

server/src/games/run/types.rs

@@ -236,6 +236,12 @@ impl RunningPile {
 			other.insert(k, v);
 		}
 
-		Ok(Self { name, cards, face_down, visible, other })
+		Ok(Self {
+			name,
+			cards,
+			face_down,
+			visible,
+			other,
+		})
 	}
 }

server/src/server/protos.rs

@@ -1,14 +1,19 @@
+#[rustfmt::skip]
 #[allow(non_camel_case_types)]
 pub mod connection;
 
+#[rustfmt::skip]
 #[allow(non_camel_case_types)]
 pub mod lobby;
 
+#[rustfmt::skip]
 #[allow(non_camel_case_types)]
 pub mod game;
 
+#[rustfmt::skip]
 #[allow(non_camel_case_types)]
 pub mod common;
 
+#[rustfmt::skip]
 #[allow(non_camel_case_types)]
 pub mod protocol;

server/src/server/protos/protocol.rs

@@ -1,9 +1,6 @@
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ClientServerPacket {
-	#[prost(
+    #[prost(oneof="client_server_packet::Data", tags="1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14")]
-		oneof = "client_server_packet::Data",
-		tags = "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14"
-	)]
     pub data: ::core::option::Option<client_server_packet::Data>,
 }
 /// Nested message and enum types in `ClientServerPacket`.
@@ -45,10 +42,7 @@ pub mod client_server_packet {
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ServerClientPacket {
-	#[prost(
+    #[prost(oneof="server_client_packet::Data", tags="1, 2, 3, 4, 5, 6, 7, 8, 9")]
-		oneof = "server_client_packet::Data",
-		tags = "1, 2, 3, 4, 5, 6, 7, 8, 9"
-	)]
     pub data: ::core::option::Option<server_client_packet::Data>,
 }
 /// Nested message and enum types in `ServerClientPacket`.