Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe4f33b7 authored by Alisher Alikhodjaev's avatar Alisher Alikhodjaev Committed by Automerger Merge Worker
Browse files

The TryFrom should be included unconditionally am: a5d8025b am: 4e48a5e3 am: e7a01b28

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1830437

Change-Id: Id532f76c887bf0c8c69a84d2fbd87d66bfd53949
parents a9ec0cc2 e7a01b28
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void generate_rust_packet_preamble(std::ostream& s) {
use bytes::{Bytes, BytesMut, BufMut};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use std::convert::TryInto;
use std::convert::{TryFrom, TryInto};
use std::fmt;
use thiserror::Error;
use std::sync::Arc;
@@ -138,7 +138,6 @@ bool generate_rust_source_one_file(

    if (opcode_index != nullptr && opcode != nullptr) {
      opcode_index->try_from_enum_ = opcode;
      out_file << "use std::convert::TryFrom;";
    }
  }