slight adjustments, remove some explicit annotations

Signed-off-by: strawberry <strawberry@puppygock.gay>

src/service/admin/debug.rs

@@ -349,7 +349,7 @@ pub(crate) async fn process(command: DebugCommand, body: Vec<&str>) -> Result<Ro
 		},
 		DebugCommand::ForceDeviceListUpdates => {
 			// Force E2EE device list updates for all users
-			for user_id in services().users.iter().filter_map(std::result::Result::ok) {
+			for user_id in services().users.iter().filter_map(Result::ok) {
 				services().users.mark_device_key_update(&user_id)?;
 			}
 			RoomMessageEventContent::text_plain("Marked all devices for all users as having new keys to update")

src/service/admin/mod.rs

@@ -231,7 +231,7 @@ impl Service {
 	}
 
 	// Parse chat messages from the admin room into an AdminCommand object
-	fn parse_admin_command(&self, command_line: &str) -> std::result::Result<AdminCommand, String> {
+	fn parse_admin_command(&self, command_line: &str) -> Result<AdminCommand, String> {
 		// Note: argv[0] is `@conduit:servername:`, which is treated as the main command
 		let mut argv = command_line.split_whitespace().collect::<Vec<_>>();
 

src/service/media/mod.rs

@@ -394,21 +394,15 @@ impl Service {
 							u64::from(original_width) * u64::from(height) / u64::from(original_height)
 						};
 						if use_width {
-							if intermediate <= u64::from(std::u32::MAX) {
+							if intermediate <= u64::from(u32::MAX) {
 								(width, intermediate as u32)
 							} else {
-								(
-									(u64::from(width) * u64::from(std::u32::MAX) / intermediate) as u32,
-									std::u32::MAX,
-								)
+								((u64::from(width) * u64::from(u32::MAX) / intermediate) as u32, u32::MAX)
 							}
-						} else if intermediate <= u64::from(std::u32::MAX) {
+						} else if intermediate <= u64::from(u32::MAX) {
 							(intermediate as u32, height)
 						} else {
-							(
-								std::u32::MAX,
-								(u64::from(height) * u64::from(std::u32::MAX) / intermediate) as u32,
-							)
+							(u32::MAX, (u64::from(height) * u64::from(u32::MAX) / intermediate) as u32)
 						}
 					};
 

src/service/rooms/state_cache/mod.rs

@@ -243,7 +243,7 @@ impl Service {
 	pub fn server_sees_user(&self, server: &ServerName, user_id: &UserId) -> Result<bool> {
 		Ok(self
 			.server_rooms(server)
-			.filter_map(std::result::Result::ok)
+			.filter_map(Result::ok)
 			.any(|room_id: OwnedRoomId| self.is_joined(user_id, &room_id).unwrap_or(false)))
 	}
 
@@ -259,7 +259,7 @@ impl Service {
 
 		Ok(self
 			.rooms_joined(a)
-			.filter_map(std::result::Result::ok)
+			.filter_map(Result::ok)
 			.any(|room_id| self.is_joined(b, &room_id).unwrap_or(false)))
 	}