data: Flattened layout fallback function

2020-12-03 15:47:44 +00:00
parent 103e64b96c
commit cc4f14e8c6
1 changed files with 26 additions and 31 deletions
--- a/src/data.rs
+++ b/src/data.rs
@ -128,10 +128,7 @@ fn list_layout_sources(
        ret
    };

-    let ret = {
-        fn name_with_arrangement(name: String, kind: &ArrangementKind)
-            -> String
-        {
+    fn name_with_arrangement(name: String, kind: &ArrangementKind) -> String {
        match kind {    
            ArrangementKind::Base => name,
            ArrangementKind::Wide => name + "_wide",
@ -161,8 +158,6 @@ fn list_layout_sources(
    };

    add_by_name(ret, FALLBACK_LAYOUT_NAME, &ArrangementKind::Base)
-    };
-    ret
 }

 fn load_layout_data(source: DataSource)