Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvement: load_cloned returns a result

Browse Source
This commit is contained in:
timokoesters 2019-10-24 10:13:32 +02:00
parent 0a1e12c9ad
commit f1b728b89b
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/assets/mod.rs
View File

@ -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.

2
server/src/lib.rs
View File

@ -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;

2
voxygen/src/menu/char_selection/mod.rs
View File

@ -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,
},
);