Merge pull request #745 from mahkoh/jorth/not-matches
all: use not_matches macro
This commit is contained in:
commit
aa40e5f360
5 changed files with 11 additions and 11 deletions
|
|
@ -840,7 +840,7 @@ pub enum XdgToplevelError {
|
|||
efrom!(XdgToplevelError, ClientError);
|
||||
|
||||
pub fn map_resize_edges(edge: u32) -> Option<ResizeEdges> {
|
||||
if !matches!(edge, 0 | 1 | 2 | 4 | 5 | 6 | 8 | 9 | 10) {
|
||||
if not_matches!(edge, 0 | 1 | 2 | 4 | 5 | 6 | 8 | 9 | 10) {
|
||||
return None;
|
||||
}
|
||||
Some(ResizeEdges {
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@ impl IoUringData {
|
|||
to_submit -= n;
|
||||
}
|
||||
Err(e) => {
|
||||
if !matches!(e.0, c::EAGAIN | c::EBUSY | c::EINTR) {
|
||||
if not_matches!(e.0, c::EAGAIN | c::EBUSY | c::EINTR) {
|
||||
return Err(IoUringError::Enter(e));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ impl UdmabufHolder {
|
|||
self.logged.exec(|| {
|
||||
log::warn!("Unable to open /dev/udmabuf: {}", ErrorFmt(&e));
|
||||
});
|
||||
if !matches!(e, UdmabufError::Open(OsError(c::EPERM))) {
|
||||
if not_matches!(e, UdmabufError::Open(OsError(c::EPERM))) {
|
||||
self.udmabuf.set(Some(None));
|
||||
}
|
||||
None
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ pub unsafe fn ioctl<T>(fd: c::c_int, request: c::c_ulong, t: &mut T) -> Result<c
|
|||
return Ok(ret);
|
||||
}
|
||||
let err = uapi::get_errno();
|
||||
if !matches!(err, c::EINTR | c::EAGAIN) {
|
||||
if not_matches!(err, c::EINTR | c::EAGAIN) {
|
||||
return Err(OsError(err));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1227,7 +1227,7 @@ impl Wm {
|
|||
.get_property::<u32>(data.window_id, ATOM_WM_TRANSIENT_FOR, ATOM_WINDOW, &mut buf)
|
||||
.await
|
||||
{
|
||||
if !matches!(e, XconError::PropertyUnavailable) {
|
||||
if not_matches!(e, XconError::PropertyUnavailable) {
|
||||
log::error!(
|
||||
"Could not retrieve WM_TRANSIENT_FOR property: {}",
|
||||
ErrorFmt(e)
|
||||
|
|
@ -1256,7 +1256,7 @@ impl Wm {
|
|||
.get_property::<u32>(data.window_id, self.atoms.WM_PROTOCOLS, ATOM_ATOM, &mut buf)
|
||||
.await
|
||||
{
|
||||
if !matches!(e, XconError::PropertyUnavailable) {
|
||||
if not_matches!(e, XconError::PropertyUnavailable) {
|
||||
log::error!("Could not retrieve WM_PROTOCOLS property: {}", ErrorFmt(e));
|
||||
}
|
||||
return;
|
||||
|
|
@ -1276,7 +1276,7 @@ impl Wm {
|
|||
.get_property::<u32>(data.window_id, self.atoms.WM_HINTS, 0, &mut buf)
|
||||
.await
|
||||
{
|
||||
if !matches!(e, XconError::PropertyUnavailable) {
|
||||
if not_matches!(e, XconError::PropertyUnavailable) {
|
||||
log::error!("Could not retrieve WM_HINTS property: {}", ErrorFmt(e));
|
||||
}
|
||||
data.info.icccm_hints.input.set(true);
|
||||
|
|
@ -1319,7 +1319,7 @@ impl Wm {
|
|||
)
|
||||
.await
|
||||
{
|
||||
if !matches!(e, XconError::PropertyUnavailable) {
|
||||
if not_matches!(e, XconError::PropertyUnavailable) {
|
||||
log::error!(
|
||||
"Could not retrieve WM_NORMAL_HINTS property: {}",
|
||||
ErrorFmt(e)
|
||||
|
|
@ -1358,7 +1358,7 @@ impl Wm {
|
|||
.get_property::<u32>(data.window_id, self.atoms._MOTIF_WM_HINTS, 0, &mut buf)
|
||||
.await
|
||||
{
|
||||
if !matches!(e, XconError::PropertyUnavailable) {
|
||||
if not_matches!(e, XconError::PropertyUnavailable) {
|
||||
log::error!(
|
||||
"Could not retrieve _MOTIF_WM_HINTS property: {}",
|
||||
ErrorFmt(e)
|
||||
|
|
@ -1413,7 +1413,7 @@ impl Wm {
|
|||
.get_property::<u32>(data.window_id, self.atoms._NET_WM_STATE, 0, &mut buf)
|
||||
.await
|
||||
{
|
||||
if !matches!(e, XconError::PropertyUnavailable) {
|
||||
if not_matches!(e, XconError::PropertyUnavailable) {
|
||||
log::error!("Could not retrieve _NET_WM_STATE property: {}", ErrorFmt(e));
|
||||
}
|
||||
return;
|
||||
|
|
@ -1446,7 +1446,7 @@ impl Wm {
|
|||
)
|
||||
.await
|
||||
{
|
||||
if !matches!(e, XconError::PropertyUnavailable) {
|
||||
if not_matches!(e, XconError::PropertyUnavailable) {
|
||||
log::error!(
|
||||
"Could not retrieve _NET_WM_WINDOW_TYPE property: {}",
|
||||
ErrorFmt(e)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue