bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove paste dependency

Browse source 
https://rustsec.org/advisories/RUSTSEC-2024-0436.html
This commit is contained in:
En-En 2025-03-17 14:07:46 +00:00 • committed by Shawn Wallace
parent beb7c3ebe0
commit cca74a5f6b
4 changed files with 20 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/server/mod.rs
View file

@ -308,7 +308,7 @@ macro_rules! handle_event_enum {
$(#[$meta:meta])*
$pub:vis enum $name:ident {
$( $variant:ident($ty:ty) ),+
}
} => $name_event:ident
) => {
enum_try_from! {
$(#[$meta])*
@ -317,19 +317,15 @@ macro_rules! handle_event_enum {
}
}
paste::paste! {
enum_try_from! {
#[derive(Debug)]
$pub enum [<$name Event>] {
$( $variant(<$ty as HandleEvent>::Event) ),+
}
enum_try_from! {
#[derive(Debug)]
$pub enum $name_event {
$( $variant(<$ty as HandleEvent>::Event) ),+
}
}
impl HandleEvent for $name {
paste::paste! {
type Event = [<$name Event>];
}
type Event = $name_event;
fn handle_event<C: XConnection>(&mut self, event: Self::Event, state: &mut ServerState<C>) {
match self {
@ -370,7 +366,7 @@ pub(crate) enum Object {
TabletPadGroup(TabletPadGroup),
TabletPadRing(TabletPadRing),
TabletPadStrip(TabletPadStrip)
}
} => ObjectEvent
}

31
src/server/tests.rs
View file

@ -1,6 +1,5 @@
use super::{ServerState, WindowDims};
use crate::xstate::{SetState, WmName};
use paste::paste;
use rustix::event::{poll, PollFd, PollFlags};
use std::collections::HashMap;
use std::io::Write;
@ -71,7 +70,7 @@ macro_rules! with_optional {
$(
$field:ident: $type:ty
),+$(,)?
}
} => $name_optional:ident
) => {
$( #[$attr] )?
struct $name$(<$($lifetimes),+>)? {
@ -80,23 +79,19 @@ macro_rules! with_optional {
),+
}
paste! {
#[derive(Default)]
struct [< $name Optional >] {
$(
$field: Option<$type>
),+
}
#[derive(Default)]
struct $name_optional {
$(
$field: Option<$type>
),+
}
paste! {
impl From<[<$name Optional>]> for $name {
fn from(opt: [<$name Optional>]) -> Self {
Self {
$(
$field: opt.$field.expect(concat!("uninitialized field ", stringify!($field)))
),+
}
impl From<$name_optional> for $name {
fn from(opt: $name_optional) -> Self {
Self {
$(
$field: opt.$field.expect(concat!("uninitialized field ", stringify!($field)))
),+
}
}
}
@ -111,7 +106,7 @@ struct Compositor {
shell: TestObject<XwaylandShellV1>,
seat: TestObject<WlSeat>,
tablet_man: TestObject<ZwpTabletManagerV2>
}
} => CompositorOptional
}