diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-03-31 09:39:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-06-15 09:37:25 +0000 |
commit | a201fd46bd0549655b85bcd6e609fdabd1add837 (patch) | |
tree | 1f51d7e5e54fb7f715cdcc45451ff114ab597f94 /devices/src/virtio/wl.rs | |
parent | 89f45363b3c902edaa137e5bc0ada605c604d854 (diff) | |
download | crosvm-a201fd46bd0549655b85bcd6e609fdabd1add837.tar crosvm-a201fd46bd0549655b85bcd6e609fdabd1add837.tar.gz crosvm-a201fd46bd0549655b85bcd6e609fdabd1add837.tar.bz2 crosvm-a201fd46bd0549655b85bcd6e609fdabd1add837.tar.lz crosvm-a201fd46bd0549655b85bcd6e609fdabd1add837.tar.xz crosvm-a201fd46bd0549655b85bcd6e609fdabd1add837.tar.zst crosvm-a201fd46bd0549655b85bcd6e609fdabd1add837.zip |
make remote wayland device optional
Diffstat (limited to 'devices/src/virtio/wl.rs')
-rw-r--r-- | devices/src/virtio/wl.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs index 6671693..6a412f9 100644 --- a/devices/src/virtio/wl.rs +++ b/devices/src/virtio/wl.rs @@ -30,7 +30,7 @@ use std::collections::btree_map::Entry; use std::collections::{BTreeMap as Map, BTreeSet as Set, VecDeque}; -use std::convert::From; +use std::convert::{From, Infallible}; use std::error::Error as StdError; use std::fmt::{self, Display}; use std::fs::File; @@ -1628,9 +1628,9 @@ impl<'de> DeserializeWithFds<'de> for Params { impl VirtioDeviceNew for Wl { type Params = Params; - type Error = (); + type Error = Infallible; - fn new(params: Params) -> Result<Self, ()> { + fn new(params: Params) -> Result<Self, Self::Error> { let Params { wayland_paths, vm_socket, |