vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wayland-rs 0.20.1 works around the rustc bug

This commit is contained in:
Victor Berger 2018-04-23 18:26:17 +02:00
parent 048dda59e3
commit ebee5feb9e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -7,15 +7,15 @@ description = "Smithay is a library for writing wayland compositors."
repository = "https://github.com/Smithay/smithay" repository = "https://github.com/Smithay/smithay"
[dependencies] [dependencies]
wayland-server = "0.20.0" wayland-server = "0.20.1"
wayland-sys = "0.20.0" wayland-sys = "0.20.1"
nix = "0.10.0" nix = "0.10.0"
xkbcommon = "0.2.1" xkbcommon = "0.2.1"
tempfile = "2.1.5" tempfile = "2.1.5"
slog = { version = "2.1.1" } slog = { version = "2.1.1" }
slog-stdlog = "3.0.2" slog-stdlog = "3.0.2"
libloading = "0.4.0" libloading = "0.4.0"
wayland-client = { version = "0.20.0", optional = true } wayland-client = { version = "0.20.1", optional = true }
winit = { version = "0.10.0", optional = true } winit = { version = "0.10.0", optional = true }
drm = { version = "^0.3.1", optional = true } drm = { version = "^0.3.1", optional = true }
gbm = { version = "^0.4.0", optional = true, default-features = false, features = ["drm-support"] } gbm = { version = "^0.4.0", optional = true, default-features = false, features = ["drm-support"] }
@ -24,7 +24,7 @@ input = { version = "0.4.0", optional = true }
udev = { version = "0.2.0", optional = true } udev = { version = "0.2.0", optional = true }
dbus = { version = "0.6.1", optional = true } dbus = { version = "0.6.1", optional = true }
systemd = { version = "^0.2.0", optional = true } systemd = { version = "^0.2.0", optional = true }
wayland-protocols = { version = "0.20.0", features = ["unstable_protocols", "server"] } wayland-protocols = { version = "0.20.1", features = ["unstable_protocols", "server"] }
image = "0.17.0" image = "0.17.0"
error-chain = "0.11.0" error-chain = "0.11.0"
lazy_static = "1.0.0" lazy_static = "1.0.0"

7
examples/helpers/implementations.rs
View File

@ -119,10 +119,9 @@ pub fn init_shell(
looptoken.clone(), looptoken.clone(),
move |request, (surface, ctoken)| match request { move |request, (surface, ctoken)| match request {
SurfaceEvent::Commit => surface_commit(&surface, ctoken, &*c_egl_display), SurfaceEvent::Commit => surface_commit(&surface, ctoken, &*c_egl_display),
SurfaceEvent::Frame { callback } => { SurfaceEvent::Frame { callback } => callback
// TODO: uncomment when https://github.com/rust-lang/rust/issues/50153 is fixed .implement(|e, _| match e {}, None::<fn(_, _)>)
// callback.implement(|e, _| match e {}, None::<fn(_,_)>).send(wl_callback::Event::Done { callback_data: 0}) .send(wl_callback::Event::Done { callback_data: 0 }),
}
}, },
log.clone(), log.clone(),
); );