improvement: load_cloned returns a result

common/src/assets/mod.rs

@@ -85,9 +85,9 @@ pub fn load<A: Asset + 'static>(specifier: &str) -> Result<Arc<A>, Error> {
 }
 
 /// Function used to load assets from the filesystem or the cache and return a clone.
-pub fn load_cloned<A: Asset + Clone + 'static>(specifier: &str) -> Option<A> {
-    let asset: Option<Arc<A>> = load(specifier).ok();
-    asset.map(|asset| (*asset).clone())
+pub fn load_cloned<A: Asset + Clone + 'static>(specifier: &str) -> Result<A, Error> {
+    let asset = load(specifier);
+    asset.map(|asset: Arc<A>| (*asset).clone())
 }
 
 /// Function used to load essential assets from the filesystem or the cache. It will panic if the asset is not found.

server/src/lib.rs

@@ -205,7 +205,7 @@ impl Server {
         server_settings: &ServerSettings,
     ) {
         // Give no item when an invalid specifier is given
-        let main = main.and_then(|specifier| assets::load_cloned(&specifier));
+        let main = main.and_then(|specifier| assets::load_cloned(&specifier).ok());
 
         let spawn_point = state.ecs().read_resource::<SpawnPoint>().0;
 

voxygen/src/menu/char_selection/mod.rs

@@ -98,7 +98,7 @@ impl PlayState for CharSelectionState {
                     main: self
                         .char_selection_ui
                         .character_tool
-                        .and_then(|specifier| assets::load_cloned(&specifier)),
+                        .and_then(|specifier| assets::load_cloned(&specifier).ok()),
                     alt: None,
                 },
             );