daxvena/elemeld - Change IG6HG46TPITA2WAGCY3OTNRZS3364F7X3NS4MX3YXO2FPKOVGG7AC

Use queued after reading

Created by daxvena on September 6, 2020

IG6HG46TPITA2WAGCY3OTNRZS3364F7X3NS4MX3YXO2FPKOVGG7AC

Dependencies

In channels

main

Change contents

Replacement in src/io.rs at line 9 [4.11]

B:BD[3.10926] → [2.4993:5061]

pub trait HostInterface: Stream<Item=HostEvent> + Sink<HostEvent> {

[3.10926]

[5.34]

pub trait HostInterface: Stream<Item=io::Result<HostEvent>> + Sink<HostEvent, Error=io::Error> {

Replacement in src/x11.rs at line 3 [6.308]
B:BD[6.344] → [2.5062:5091]
```
use futures::{Sink, Stream};
```
[6.344]
[7.501]
```
use futures::{ready, Sink, Stream};
```

Replacement in src/x11.rs at line 302 [6.308]

B:BD[2.10596] → [2.10596:10674]

                xlib::GrabModeAsync, xlib::GrabModeAsync, xlib::CurrentTime);

[2.10596]

[2.10674]

                xlib::GrabModeAsync, xlib::GrabModeAsync, xlib::CurrentTime
            );

Replacement in src/x11.rs at line 315 [6.308]
B:BD[2.10813] → [2.10813:10840]
```
    type Item = HostEvent;
```
[2.10813]
[2.10840]
```
    type Item = io::Result<HostEvent>;
```

Replacement in src/x11.rs at line 318 [6.308]

B:BD[2.10928] → [2.10928:11099]

        match self.io.poll_read_ready(cx, mio::Ready::readable()) {
            Poll::Ready(result) => result.unwrap(),
            Poll::Pending => return Poll::Pending,

[2.10928]

[2.11099]

        ready!(self.io.poll_read_ready(cx, mio::Ready::readable()))?;
        // TODO: Add XEventsQueued constants to xlib
        #[allow(non_upper_case_globals)]
        const QueuedAfterReading: i32 = 1;
        let num_events = unsafe {
            (self.xlib.XEventsQueued)(self.display, QueuedAfterReading)

Deletion in src/x11.rs at line 328 [6.308]
∅:D[8.7618] → [5.15106:15178]
∅:D[3.16840] → [5.15106:15178]
∅:D[2.11111] → [5.15106:15178]
B:BD[5.15106] → [5.15106:15178]
```
        let num_events = unsafe { (self.xlib.XPending)(self.display) };
```

Replacement in src/x11.rs at line 329 [6.308]

B:BD[5.15207] → [2.11112:11187]

            self.io.clear_read_ready(cx, mio::Ready::readable()).unwrap();

[5.15207]

[2.11187]

            self.io.clear_read_ready(cx, mio::Ready::readable())?;

Replacement in src/x11.rs at line 359 [6.308]

B:BD[2.12343] → [2.12343:12406]

            Some(host_event) => Poll::Ready(Some(host_event)),

[2.12343]

[2.12406]

            Some(host_event) => Poll::Ready(Some(Ok(host_event))),

Replacement in src/x11.rs at line 369 [6.308]

B:BD[2.12619] → [2.12619:12786]

        match self.io.poll_write_ready(cx) {
            Poll::Ready(result) => Poll::Ready(result.map(|_| ())),
            Poll::Pending => Poll::Pending,
        }

[2.12619]

[5.15886]

        ready!(self.io.poll_write_ready(cx))?;
        Poll::Ready(Ok(()))

Insertion in src/x11.rs at line 388 [6.308]

[2.13170]

                // NOTE: Will block until output buffer is completely flushed,
                // but let's assume the X server will always be responsive.
                // If it isn't, we have bigger problems.