s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Make borrowing compliant with older Rust

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-10-16 12:04:17 +00:00
parent 35ad61890e
commit bd3b27eceb
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/data.rs
View File

@ -112,31 +112,31 @@ fn list_layout_sources(
keyboards_path: Option<PathBuf>,
) -> Vec<DataSource> {
let mut ret = Vec::new();
{
let mut add_by_name = |name: &str| {
if let Some(path) = keyboards_path.clone() {
ret.push(DataSource::File(
path.join(name.to_owned()).with_extension("yaml")
))
}
ret.push(DataSource::Resource(name.into()));
};
let mut add_by_name = |name: &str| {
if let Some(path) = keyboards_path.clone() {
ret.push(DataSource::File(
path.join(name.to_owned()).with_extension("yaml")
))
}
ret.push(DataSource::Resource(name.into()));
};
match &type_ {
LayoutType::Base => {},
type_ => add_by_name(&type_.apply_to_name(name.into())),
};
match &type_ {
LayoutType::Base => {},
type_ => add_by_name(&type_.apply_to_name(name.into())),
};
add_by_name(name);
add_by_name(name);
match &type_ {
LayoutType::Base => {},
type_ => add_by_name(&type_.apply_to_name(FALLBACK_LAYOUT_NAME.into())),
};
add_by_name(FALLBACK_LAYOUT_NAME);
match &type_ {
LayoutType::Base => {},
type_ => add_by_name(&type_.apply_to_name(FALLBACK_LAYOUT_NAME.into())),
};
add_by_name(FALLBACK_LAYOUT_NAME);
}
ret
}