From 6c1e23eee3065b3f3d6fc4fb992ac9884dbabf68 Mon Sep 17 00:00:00 2001
From: Jingkui Wang <jkwang@google.com>
Date: Tue, 9 Apr 2019 14:30:21 -0700
Subject: 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>
---
 bit_field/bit_field_derive/bit_field_derive.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bit_field/bit_field_derive')

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 {
-- 
cgit 1.4.1