first pass of merging in warp (doesn't build)

app/src/autoupdate/channel_versions.rs

@@ -1,13 +1,13 @@
-use std::{env, fs::read_to_string, sync::Arc};
+use std::env;
+use std::fs::read_to_string;
+use std::sync::Arc;
 
 use anyhow::{Context as _, Result};
 use channel_versions::ChannelVersions;
 
-use crate::{
-    channel::{Channel, ChannelState},
-    report_error,
-    server::server_api::{ServerApi, FETCH_CHANNEL_VERSIONS_TIMEOUT},
-};
+use crate::channel::{Channel, ChannelState};
+use crate::report_error;
+use crate::server::server_api::{ServerApi, FETCH_CHANNEL_VERSIONS_TIMEOUT};
 
 // Fetches channel versions asynchronously from the Warp server. If the Warp server request fails,
 // then fetches from GCP JSON storage as a fallback.