build: Make borrowing compliant with older Rust
This commit is contained in:
42
src/data.rs
42
src/data.rs
@ -112,31 +112,31 @@ fn list_layout_sources(
|
|||||||
keyboards_path: Option<PathBuf>,
|
keyboards_path: Option<PathBuf>,
|
||||||
) -> Vec<DataSource> {
|
) -> Vec<DataSource> {
|
||||||
let mut ret = Vec::new();
|
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| {
|
match &type_ {
|
||||||
if let Some(path) = keyboards_path.clone() {
|
LayoutType::Base => {},
|
||||||
ret.push(DataSource::File(
|
type_ => add_by_name(&type_.apply_to_name(name.into())),
|
||||||
path.join(name.to_owned()).with_extension("yaml")
|
};
|
||||||
))
|
|
||||||
}
|
|
||||||
|
|
||||||
ret.push(DataSource::Resource(name.into()));
|
|
||||||
};
|
|
||||||
|
|
||||||
match &type_ {
|
add_by_name(name);
|
||||||
LayoutType::Base => {},
|
|
||||||
type_ => add_by_name(&type_.apply_to_name(name.into())),
|
|
||||||
};
|
|
||||||
|
|
||||||
add_by_name(name);
|
match &type_ {
|
||||||
|
LayoutType::Base => {},
|
||||||
match &type_ {
|
type_ => add_by_name(&type_.apply_to_name(FALLBACK_LAYOUT_NAME.into())),
|
||||||
LayoutType::Base => {},
|
};
|
||||||
type_ => add_by_name(&type_.apply_to_name(FALLBACK_LAYOUT_NAME.into())),
|
|
||||||
};
|
|
||||||
|
|
||||||
add_by_name(FALLBACK_LAYOUT_NAME);
|
|
||||||
|
|
||||||
|
add_by_name(FALLBACK_LAYOUT_NAME);
|
||||||
|
}
|
||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user