diff options
| author | Chirantan Ekbote <chirantan@chromium.org> | 2020-05-20 19:31:49 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-28 07:14:55 +0000 |
| commit | e64841b1bba00f6e2c113b002f6d1e98bc904b0d (patch) | |
| tree | ba6794a600b0ce405be2fa4ece8c609115c3c0b6 | |
| parent | 0cf8ff69e4701b7a8eedcad7509ab9f23a934d5f (diff) | |
| download | adhd-e64841b1bba00f6e2c113b002f6d1e98bc904b0d.tar.gz | |
libcras: Update for IntoIovec api change
send_with_fds now takes a &[D], where D: IntoIovec. This trait is
implemented for IoSlice so use it here.
BUG=none
TEST=unit tests
Cq-Depend: chromium:2208527
Change-Id: I999a1ca4c103681866d7223e72dff104e22cbb97
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2210272
Reviewed-by: Fletcher Woodruff <fletcherw@chromium.org>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
Tested-by: Chirantan Ekbote <chirantan@chromium.org>
| -rw-r--r-- | cras/client/libcras/src/cras_server_socket.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cras/client/libcras/src/cras_server_socket.rs b/cras/client/libcras/src/cras_server_socket.rs index 34e8cbd4..4a7d9151 100644 --- a/cras/client/libcras/src/cras_server_socket.rs +++ b/cras/client/libcras/src/cras_server_socket.rs @@ -65,10 +65,13 @@ impl CrasServerSocket { ) -> io::Result<usize> { match fds.len() { 0 => self.socket.send(message.as_slice()), - _ => match self.send_with_fds(message.as_slice(), fds) { - Ok(len) => Ok(len), - Err(err) => Err(io::Error::new(io::ErrorKind::Other, format!("{}", err))), - }, + _ => { + let ioslice = io::IoSlice::new(message.as_slice()); + match self.send_with_fds(&[ioslice], fds) { + Ok(len) => Ok(len), + Err(err) => Err(io::Error::new(io::ErrorKind::Other, format!("{}", err))), + } + } } } |