diff options
author | David Tolnay <dtolnay@chromium.org> | 2019-04-15 15:56:35 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-18 19:51:01 -0700 |
commit | 64cd5eae5778b86f6e498a6fa1b1962693aa5a46 (patch) | |
tree | 9b68f7fce3385c410f4fd9c4e978660a9b5a0973 /p9/src/protocol | |
parent | b1de6323ab8c96c52a60e0ff735e4bbb8a8464c9 (diff) | |
download | crosvm-64cd5eae5778b86f6e498a6fa1b1962693aa5a46.tar crosvm-64cd5eae5778b86f6e498a6fa1b1962693aa5a46.tar.gz crosvm-64cd5eae5778b86f6e498a6fa1b1962693aa5a46.tar.bz2 crosvm-64cd5eae5778b86f6e498a6fa1b1962693aa5a46.tar.lz crosvm-64cd5eae5778b86f6e498a6fa1b1962693aa5a46.tar.xz crosvm-64cd5eae5778b86f6e498a6fa1b1962693aa5a46.tar.zst crosvm-64cd5eae5778b86f6e498a6fa1b1962693aa5a46.zip |
edition: Eliminate ref keyword
As described in: https://doc.rust-lang.org/edition-guide/rust-2018/ownership-and-lifetimes/default-match-bindings.html which also covers the new mental model that the Rust Book will use for teaching binding modes and has been found to be more friendly for both beginners and experienced users. Before: match *opt { Some(ref v) => ..., None => ..., } After: match opt { Some(v) => ..., None => ..., } TEST=cargo check --all-features TEST=local kokoro Change-Id: I3c5800a9be36aaf5d3290ae3bd3116f699cb00b7 Reviewed-on: https://chromium-review.googlesource.com/1566669 Commit-Ready: David Tolnay <dtolnay@chromium.org> Tested-by: David Tolnay <dtolnay@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'p9/src/protocol')
-rw-r--r-- | p9/src/protocol/messages.rs | 196 |
1 files changed, 98 insertions, 98 deletions
diff --git a/p9/src/protocol/messages.rs b/p9/src/protocol/messages.rs index f149e3c..c8429bb 100644 --- a/p9/src/protocol/messages.rs +++ b/p9/src/protocol/messages.rs @@ -124,35 +124,35 @@ pub struct Tframe { impl WireFormat for Tframe { fn byte_size(&self) -> u32 { - let msg_size = match self.msg { - Tmessage::Version(ref version) => version.byte_size(), - Tmessage::Flush(ref flush) => flush.byte_size(), - Tmessage::Walk(ref walk) => walk.byte_size(), - Tmessage::Read(ref read) => read.byte_size(), - Tmessage::Write(ref write) => write.byte_size(), - Tmessage::Clunk(ref clunk) => clunk.byte_size(), - Tmessage::Remove(ref remove) => remove.byte_size(), - Tmessage::Attach(ref attach) => attach.byte_size(), - Tmessage::Auth(ref auth) => auth.byte_size(), - Tmessage::Statfs(ref statfs) => statfs.byte_size(), - Tmessage::Lopen(ref lopen) => lopen.byte_size(), - Tmessage::Lcreate(ref lcreate) => lcreate.byte_size(), - Tmessage::Symlink(ref symlink) => symlink.byte_size(), - Tmessage::Mknod(ref mknod) => mknod.byte_size(), - Tmessage::Rename(ref rename) => rename.byte_size(), - Tmessage::Readlink(ref readlink) => readlink.byte_size(), - Tmessage::GetAttr(ref getattr) => getattr.byte_size(), - Tmessage::SetAttr(ref setattr) => setattr.byte_size(), - Tmessage::XattrWalk(ref xattrwalk) => xattrwalk.byte_size(), - Tmessage::XattrCreate(ref xattrcreate) => xattrcreate.byte_size(), - Tmessage::Readdir(ref readdir) => readdir.byte_size(), - Tmessage::Fsync(ref fsync) => fsync.byte_size(), - Tmessage::Lock(ref lock) => lock.byte_size(), - Tmessage::GetLock(ref getlock) => getlock.byte_size(), - Tmessage::Link(ref link) => link.byte_size(), - Tmessage::Mkdir(ref mkdir) => mkdir.byte_size(), - Tmessage::RenameAt(ref renameat) => renameat.byte_size(), - Tmessage::UnlinkAt(ref unlinkat) => unlinkat.byte_size(), + let msg_size = match &self.msg { + Tmessage::Version(version) => version.byte_size(), + Tmessage::Flush(flush) => flush.byte_size(), + Tmessage::Walk(walk) => walk.byte_size(), + Tmessage::Read(read) => read.byte_size(), + Tmessage::Write(write) => write.byte_size(), + Tmessage::Clunk(clunk) => clunk.byte_size(), + Tmessage::Remove(remove) => remove.byte_size(), + Tmessage::Attach(attach) => attach.byte_size(), + Tmessage::Auth(auth) => auth.byte_size(), + Tmessage::Statfs(statfs) => statfs.byte_size(), + Tmessage::Lopen(lopen) => lopen.byte_size(), + Tmessage::Lcreate(lcreate) => lcreate.byte_size(), + Tmessage::Symlink(symlink) => symlink.byte_size(), + Tmessage::Mknod(mknod) => mknod.byte_size(), + Tmessage::Rename(rename) => rename.byte_size(), + Tmessage::Readlink(readlink) => readlink.byte_size(), + Tmessage::GetAttr(getattr) => getattr.byte_size(), + Tmessage::SetAttr(setattr) => setattr.byte_size(), + Tmessage::XattrWalk(xattrwalk) => xattrwalk.byte_size(), + Tmessage::XattrCreate(xattrcreate) => xattrcreate.byte_size(), + Tmessage::Readdir(readdir) => readdir.byte_size(), + Tmessage::Fsync(fsync) => fsync.byte_size(), + Tmessage::Lock(lock) => lock.byte_size(), + Tmessage::GetLock(getlock) => getlock.byte_size(), + Tmessage::Link(link) => link.byte_size(), + Tmessage::Mkdir(mkdir) => mkdir.byte_size(), + Tmessage::RenameAt(renameat) => renameat.byte_size(), + Tmessage::UnlinkAt(unlinkat) => unlinkat.byte_size(), }; // size + type + tag + message size @@ -196,35 +196,35 @@ impl WireFormat for Tframe { ty.encode(writer)?; self.tag.encode(writer)?; - match self.msg { - Tmessage::Version(ref version) => version.encode(writer), - Tmessage::Flush(ref flush) => flush.encode(writer), - Tmessage::Walk(ref walk) => walk.encode(writer), - Tmessage::Read(ref read) => read.encode(writer), - Tmessage::Write(ref write) => write.encode(writer), - Tmessage::Clunk(ref clunk) => clunk.encode(writer), - Tmessage::Remove(ref remove) => remove.encode(writer), - Tmessage::Attach(ref attach) => attach.encode(writer), - Tmessage::Auth(ref auth) => auth.encode(writer), - Tmessage::Statfs(ref statfs) => statfs.encode(writer), - Tmessage::Lopen(ref lopen) => lopen.encode(writer), - Tmessage::Lcreate(ref lcreate) => lcreate.encode(writer), - Tmessage::Symlink(ref symlink) => symlink.encode(writer), - Tmessage::Mknod(ref mknod) => mknod.encode(writer), - Tmessage::Rename(ref rename) => rename.encode(writer), - Tmessage::Readlink(ref readlink) => readlink.encode(writer), - Tmessage::GetAttr(ref getattr) => getattr.encode(writer), - Tmessage::SetAttr(ref setattr) => setattr.encode(writer), - Tmessage::XattrWalk(ref xattrwalk) => xattrwalk.encode(writer), - Tmessage::XattrCreate(ref xattrcreate) => xattrcreate.encode(writer), - Tmessage::Readdir(ref readdir) => readdir.encode(writer), - Tmessage::Fsync(ref fsync) => fsync.encode(writer), - Tmessage::Lock(ref lock) => lock.encode(writer), - Tmessage::GetLock(ref getlock) => getlock.encode(writer), - Tmessage::Link(ref link) => link.encode(writer), - Tmessage::Mkdir(ref mkdir) => mkdir.encode(writer), - Tmessage::RenameAt(ref renameat) => renameat.encode(writer), - Tmessage::UnlinkAt(ref unlinkat) => unlinkat.encode(writer), + match &self.msg { + Tmessage::Version(version) => version.encode(writer), + Tmessage::Flush(flush) => flush.encode(writer), + Tmessage::Walk(walk) => walk.encode(writer), + Tmessage::Read(read) => read.encode(writer), + Tmessage::Write(write) => write.encode(writer), + Tmessage::Clunk(clunk) => clunk.encode(writer), + Tmessage::Remove(remove) => remove.encode(writer), + Tmessage::Attach(attach) => attach.encode(writer), + Tmessage::Auth(auth) => auth.encode(writer), + Tmessage::Statfs(statfs) => statfs.encode(writer), + Tmessage::Lopen(lopen) => lopen.encode(writer), + Tmessage::Lcreate(lcreate) => lcreate.encode(writer), + Tmessage::Symlink(symlink) => symlink.encode(writer), + Tmessage::Mknod(mknod) => mknod.encode(writer), + Tmessage::Rename(rename) => rename.encode(writer), + Tmessage::Readlink(readlink) => readlink.encode(writer), + Tmessage::GetAttr(getattr) => getattr.encode(writer), + Tmessage::SetAttr(setattr) => setattr.encode(writer), + Tmessage::XattrWalk(xattrwalk) => xattrwalk.encode(writer), + Tmessage::XattrCreate(xattrcreate) => xattrcreate.encode(writer), + Tmessage::Readdir(readdir) => readdir.encode(writer), + Tmessage::Fsync(fsync) => fsync.encode(writer), + Tmessage::Lock(lock) => lock.encode(writer), + Tmessage::GetLock(getlock) => getlock.encode(writer), + Tmessage::Link(link) => link.encode(writer), + Tmessage::Mkdir(mkdir) => mkdir.encode(writer), + Tmessage::RenameAt(renameat) => renameat.encode(writer), + Tmessage::UnlinkAt(unlinkat) => unlinkat.encode(writer), } } @@ -538,36 +538,36 @@ pub struct Rframe { impl WireFormat for Rframe { fn byte_size(&self) -> u32 { - let msg_size = match self.msg { - Rmessage::Version(ref version) => version.byte_size(), + let msg_size = match &self.msg { + Rmessage::Version(version) => version.byte_size(), Rmessage::Flush => 0, - Rmessage::Walk(ref walk) => walk.byte_size(), - Rmessage::Read(ref read) => read.byte_size(), - Rmessage::Write(ref write) => write.byte_size(), + Rmessage::Walk(walk) => walk.byte_size(), + Rmessage::Read(read) => read.byte_size(), + Rmessage::Write(write) => write.byte_size(), Rmessage::Clunk => 0, Rmessage::Remove => 0, - Rmessage::Attach(ref attach) => attach.byte_size(), - Rmessage::Auth(ref auth) => auth.byte_size(), - Rmessage::Statfs(ref statfs) => statfs.byte_size(), - Rmessage::Lopen(ref lopen) => lopen.byte_size(), - Rmessage::Lcreate(ref lcreate) => lcreate.byte_size(), - Rmessage::Symlink(ref symlink) => symlink.byte_size(), - Rmessage::Mknod(ref mknod) => mknod.byte_size(), + Rmessage::Attach(attach) => attach.byte_size(), + Rmessage::Auth(auth) => auth.byte_size(), + Rmessage::Statfs(statfs) => statfs.byte_size(), + Rmessage::Lopen(lopen) => lopen.byte_size(), + Rmessage::Lcreate(lcreate) => lcreate.byte_size(), + Rmessage::Symlink(symlink) => symlink.byte_size(), + Rmessage::Mknod(mknod) => mknod.byte_size(), Rmessage::Rename => 0, - Rmessage::Readlink(ref readlink) => readlink.byte_size(), - Rmessage::GetAttr(ref getattr) => getattr.byte_size(), + Rmessage::Readlink(readlink) => readlink.byte_size(), + Rmessage::GetAttr(getattr) => getattr.byte_size(), Rmessage::SetAttr => 0, - Rmessage::XattrWalk(ref xattrwalk) => xattrwalk.byte_size(), + Rmessage::XattrWalk(xattrwalk) => xattrwalk.byte_size(), Rmessage::XattrCreate => 0, - Rmessage::Readdir(ref readdir) => readdir.byte_size(), + Rmessage::Readdir(readdir) => readdir.byte_size(), Rmessage::Fsync => 0, - Rmessage::Lock(ref lock) => lock.byte_size(), - Rmessage::GetLock(ref getlock) => getlock.byte_size(), + Rmessage::Lock(lock) => lock.byte_size(), + Rmessage::GetLock(getlock) => getlock.byte_size(), Rmessage::Link => 0, - Rmessage::Mkdir(ref mkdir) => mkdir.byte_size(), + Rmessage::Mkdir(mkdir) => mkdir.byte_size(), Rmessage::RenameAt => 0, Rmessage::UnlinkAt => 0, - Rmessage::Lerror(ref lerror) => lerror.byte_size(), + Rmessage::Lerror(lerror) => lerror.byte_size(), }; // size + type + tag + message size @@ -612,36 +612,36 @@ impl WireFormat for Rframe { ty.encode(writer)?; self.tag.encode(writer)?; - match self.msg { - Rmessage::Version(ref version) => version.encode(writer), + match &self.msg { + Rmessage::Version(version) => version.encode(writer), Rmessage::Flush => Ok(()), - Rmessage::Walk(ref walk) => walk.encode(writer), - Rmessage::Read(ref read) => read.encode(writer), - Rmessage::Write(ref write) => write.encode(writer), + Rmessage::Walk(walk) => walk.encode(writer), + Rmessage::Read(read) => read.encode(writer), + Rmessage::Write(write) => write.encode(writer), Rmessage::Clunk => Ok(()), Rmessage::Remove => Ok(()), - Rmessage::Attach(ref attach) => attach.encode(writer), - Rmessage::Auth(ref auth) => auth.encode(writer), - Rmessage::Statfs(ref statfs) => statfs.encode(writer), - Rmessage::Lopen(ref lopen) => lopen.encode(writer), - Rmessage::Lcreate(ref lcreate) => lcreate.encode(writer), - Rmessage::Symlink(ref symlink) => symlink.encode(writer), - Rmessage::Mknod(ref mknod) => mknod.encode(writer), + Rmessage::Attach(attach) => attach.encode(writer), + Rmessage::Auth(auth) => auth.encode(writer), + Rmessage::Statfs(statfs) => statfs.encode(writer), + Rmessage::Lopen(lopen) => lopen.encode(writer), + Rmessage::Lcreate(lcreate) => lcreate.encode(writer), + Rmessage::Symlink(symlink) => symlink.encode(writer), + Rmessage::Mknod(mknod) => mknod.encode(writer), Rmessage::Rename => Ok(()), - Rmessage::Readlink(ref readlink) => readlink.encode(writer), - Rmessage::GetAttr(ref getattr) => getattr.encode(writer), + Rmessage::Readlink(readlink) => readlink.encode(writer), + Rmessage::GetAttr(getattr) => getattr.encode(writer), Rmessage::SetAttr => Ok(()), - Rmessage::XattrWalk(ref xattrwalk) => xattrwalk.encode(writer), + Rmessage::XattrWalk(xattrwalk) => xattrwalk.encode(writer), Rmessage::XattrCreate => Ok(()), - Rmessage::Readdir(ref readdir) => readdir.encode(writer), + Rmessage::Readdir(readdir) => readdir.encode(writer), Rmessage::Fsync => Ok(()), - Rmessage::Lock(ref lock) => lock.encode(writer), - Rmessage::GetLock(ref getlock) => getlock.encode(writer), + Rmessage::Lock(lock) => lock.encode(writer), + Rmessage::GetLock(getlock) => getlock.encode(writer), Rmessage::Link => Ok(()), - Rmessage::Mkdir(ref mkdir) => mkdir.encode(writer), + Rmessage::Mkdir(mkdir) => mkdir.encode(writer), Rmessage::RenameAt => Ok(()), Rmessage::UnlinkAt => Ok(()), - Rmessage::Lerror(ref lerror) => lerror.encode(writer), + Rmessage::Lerror(lerror) => lerror.encode(writer), } } |