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

Commit b9b21034 authored by Zach Johnson's avatar Zach Johnson
Browse files

rusty-gd: some tidying up of imports & formatting 

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Id98b6ad953908de110ad34c6443d6812588332c5
parent 804f8bd9

system/gd/rust/common/src/lib.rs

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ pub mod time; 
#[macro_use]

mod ready;





#[cfg(test)]

#[macro_use]

mod asserts;

system/gd/rust/facade/src/lib.rs

+6 −12
Original line number Diff line number Diff line
@@ -10,26 +10,20 @@ pub mod empty { 


use bt_facade_common_proto::common;

use bt_facade_rootservice_proto::rootservice;

use rootservice::*;

use rootservice_grpc::{create_root_facade, RootFacade};



use bt_hal::facade::HciHalFacadeService;

use bt_hal::hal_module;

use bt_hal::rootcanal_hal::RootcanalConfig;

use bt_hci::facade::HciLayerFacadeService;

use bt_hci::hci_module;



use tokio::runtime::Runtime;

use tokio::sync::mpsc::{channel, Sender};

use tokio::sync::oneshot;



use futures::executor::block_on;

use gddi::{module, Registry, RegistryBuilder};



use grpcio::*;



use rootservice::*;

use rootservice_grpc::{create_root_facade, RootFacade};

use std::sync::Arc;



use futures::executor::block_on;

use tokio::runtime::Runtime;

use tokio::sync::mpsc::{channel, Sender};

use tokio::sync::oneshot;



module! {

    stack_module,

system/gd/rust/facade/src/main.rs

+5 −16
Original line number Diff line number Diff line
@@ -7,24 +7,17 @@ use clap::{App, Arg}; 
#[macro_use]

extern crate lazy_static;



use grpcio::*;



use bluetooth_with_facades::RootFacadeService;

use futures::channel::mpsc;

use futures::executor::block_on;

use futures::stream::StreamExt;



use bluetooth_with_facades::RootFacadeService;



use grpcio::*;

use nix::sys::signal;

use std::net::{IpAddr, Ipv4Addr, Shutdown, SocketAddr};

use std::sync::Arc;

use std::sync::Mutex;



use std::sync::{Arc, Mutex};

use tokio::net::TcpStream;



use tokio::runtime::Runtime;



use nix::sys::signal;



fn main() {

    let sigint = install_sigint();

    let rt = Arc::new(Runtime::new().unwrap());
@@ -57,11 +50,7 @@ async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) { 
                .long("rootcanal-port")

                .takes_value(true),

        )

        .arg(

            Arg::with_name("btsnoop")

                .long("btsnoop")

                .takes_value(true),

        )

        .arg(Arg::with_name("btsnoop").long("btsnoop").takes_value(true))

        .arg(

            Arg::with_name("btconfig")

                .long("btconfig")

system/gd/rust/gddi/src/lib.rs

+1 −4
Original line number Diff line number Diff line 
//! Core dependency injection objects



use std::any::{Any, TypeId};

use std::collections::HashMap;



use std::any::Any;

use std::any::TypeId;

use std::future::Future;

use std::pin::Pin;

use std::sync::Arc;



use tokio::sync::Mutex;



pub use gddi_macros::{module, provides};

system/gd/rust/hal/src/facade.rs

+5 −11
Original line number Diff line number Diff line 
//! BT HCI HAL facade



use crate::HalExports;

use bt_hal_proto::empty::Empty;

use bt_hal_proto::facade::*;

use bt_hal_proto::facade_grpc::{create_hci_hal_facade, HciHalFacade};



use gddi::{module, provides};

use tokio::runtime::Runtime;

use tokio::sync::mpsc;

use tokio::sync::Mutex;



use bt_packet::{HciCommand, HciEvent, RawPacket};

use futures::sink::SinkExt;

use gddi::{module, provides};

use grpcio::*;



use std::sync::Arc;



use crate::HalExports;



use bt_packet::{HciCommand, HciEvent, RawPacket};

use tokio::runtime::Runtime;

use tokio::sync::{mpsc, Mutex};



module! {

    hal_facade_module,