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

build: Avoid MaybeUninit on older Debian

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-10-03 13:11:17 +00:00
parent 20c44476a3
commit 523caa99c5
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml.in
View File

@ -19,6 +19,7 @@ path = "@path@/examples/test_layout.rs"
[features] [features]
gio_v0_5 = [] gio_v0_5 = []
gtk_v0_5 = [] gtk_v0_5 = []
rustc_less_1_36 = []
# Dependencies which don't change based on build flags # Dependencies which don't change based on build flags
[dependencies.cairo-sys-rs] [dependencies.cairo-sys-rs]

2
meson.build
View File

@ -83,7 +83,7 @@ cargo_toml_base = configure_file(
cargo_deps = files('Cargo.deps') cargo_deps = files('Cargo.deps')
if get_option('legacy') == true if get_option('legacy') == true
cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5'] cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5,rustc_less_1_36']
cargo_deps = files('Cargo.deps.legacy') cargo_deps = files('Cargo.deps.legacy')
endif endif

4
src/keyboard.rs
View File

@ -143,7 +143,11 @@ fn single_key_map_new() -> SingleKeyMap {
unsafe { unsafe {
// Inspired by // Inspired by
// https://www.reddit.com/r/rust/comments/5n7bh1/how_to_create_an_array_of_a_type_with_clone_but/ // https://www.reddit.com/r/rust/comments/5n7bh1/how_to_create_an_array_of_a_type_with_clone_but/
#[cfg(feature = "rustc_less_1_36")]
let mut array: SingleKeyMap = mem::uninitialized();
#[cfg(not(feature = "rustc_less_1_36"))]
let mut array: SingleKeyMap = mem::MaybeUninit::uninit().assume_init(); let mut array: SingleKeyMap = mem::MaybeUninit::uninit().assume_init();
for element in array.iter_mut() { for element in array.iter_mut() {
ptr::write(element, None); ptr::write(element, None);
} }