summary refs log tree commit diff
path: root/bit_field/bit_field_derive
diff options
context:
space:
mode:
authorJingkui Wang <jkwang@google.com>2019-04-09 14:30:21 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-05-25 02:31:16 -0700
commit6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68 (patch)
tree63514ac56b73078479bc662a8f9514b05e11cc85 /bit_field/bit_field_derive
parenta27f3a74d3c54fe944489f54432862144a8868b3 (diff)
downloadcrosvm-6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68.tar
crosvm-6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68.tar.gz
crosvm-6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68.tar.bz2
crosvm-6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68.tar.lz
crosvm-6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68.tar.xz
crosvm-6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68.tar.zst
crosvm-6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68.zip
crosvm: update xhci abi to use new bit_field features
We don't need schema anymore. Will use bool and custom enums.

BUG=None
TEST=local build and run crosvm

Change-Id: I1396916878f2903b17a75f375aee4eec1ced0583
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1564780
Tested-by: kokoro <noreply+kokoro@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'bit_field/bit_field_derive')
-rw-r--r--bit_field/bit_field_derive/bit_field_derive.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/bit_field/bit_field_derive/bit_field_derive.rs b/bit_field/bit_field_derive/bit_field_derive.rs
index 8a9fb50..7084e22 100644
--- a/bit_field/bit_field_derive/bit_field_derive.rs
+++ b/bit_field/bit_field_derive/bit_field_derive.rs
@@ -179,7 +179,7 @@ fn bitfield_enum_with_width_impl(
         impl bit_field::BitFieldSpecifier for #ident {
             const FIELD_WIDTH: u8 = #bits;
             type SetterType = Self;
-            type GetterType = Result<Self, bit_field::Error>;
+            type GetterType = std::result::Result<Self, bit_field::Error>;
 
             #[inline]
             fn from_u64(val: u64) -> Self::GetterType {