Bump smithay-client-toolkit version to v0.16.0

This commit is contained in:
Kirill Chibisov 2022-06-20 01:25:23 +03:00 committed by Victor Berger
parent f642b3e86d
commit f89b531897
4 changed files with 10 additions and 9 deletions

View file

@ -2,6 +2,8 @@
## Unreleased
- Update SCTK to 0.16
## 0.6.5 -- 2021-10-31
- Update SCTK to 0.15, updating wayland-rs to `0.29`

View file

@ -10,11 +10,11 @@ license = "MIT"
keywords = ["clipboard", "wayland"]
[dependencies]
sctk = { package = "smithay-client-toolkit", version = "0.15", default-features = false }
sctk = { package = "smithay-client-toolkit", version = "0.16", default-features = false }
wayland-client = { version = "0.29", features = ["use_system_lib"] }
[dev-dependencies]
sctk = { package = "smithay-client-toolkit", version = "0.15", default-features = false, features = ["calloop"] }
sctk = { package = "smithay-client-toolkit", version = "0.16", default-features = false, features = ["calloop"] }
[features]
default = ["dlopen"]

View file

@ -101,8 +101,8 @@ fn main() {
// Insert repeat rate handling source
match keyboard_mapping_result {
Ok((keyboard, repeat_source)) => {
seats.push((seat.detach(), Some((keyboard, repeat_source))));
Ok(keyboard) => {
seats.push((seat.detach(), Some(keyboard)));
}
Err(err) => {
eprintln!("Failed to map keyboard on seat {:?} : {:?}", seat_data.name, err);
@ -143,19 +143,18 @@ fn main() {
// Insert repeat rate source
match keyboard_mapping_result {
Ok((keyboard, repeat_source)) => {
*mapped_keyboard = Some((keyboard, repeat_source));
Ok(keyboard) => {
*mapped_keyboard = Some(keyboard);
}
Err(err) => {
eprintln!("Failed to map keyboard on seat {} : {:?}", seat_data.name, err);
}
}
}
} else if let Some((keyboard, repeat_source)) = mapped_keyboard.take() {
} else if let Some(keyboard) = mapped_keyboard.take() {
if keyboard.as_ref().version() >= 3 {
keyboard.release();
}
event_loop_handle.remove(repeat_source);
}
});

View file

@ -45,5 +45,5 @@ impl ToString for MimeType {
/// RFC-2046, however the platform line terminator and what applications
/// expect is LF.
pub fn normalize_to_lf(text: String) -> String {
text.replace("\r\n", "\n").replace("\r", "\n")
text.replace("\r\n", "\n").replace('\r', "\n")
}