assorted changes

Author: stepancheg

.github/workflows/ci.yml

@@ -86,6 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ACTION: test-protoc-plugin
+      PROTOBUF_VERSION: 3.1.0
     steps:
       - name: cargo cache
         uses: actions/cache@v2

.rustfmt.toml

@@ -0,0 +1 @@
+imports_granularity = "Item"

ci-gen/src/main.rs

@@ -1,11 +1,9 @@
-use std::fs;
-use std::path::Path;
-
+use gh_actions_gen::actions::cargo_cache;
+use gh_actions_gen::actions::cargo_doc;
 use gh_actions_gen::actions::cargo_test;
 use gh_actions_gen::actions::checkout_sources;
 use gh_actions_gen::actions::rust_install_toolchain;
 use gh_actions_gen::actions::RustToolchain;
-use gh_actions_gen::actions::{cargo_cache, cargo_doc};
 use gh_actions_gen::ghwf::Env;
 use gh_actions_gen::ghwf::Job;
 use gh_actions_gen::ghwf::Step;
@@ -43,6 +41,10 @@ fn install_protobuf_step() -> Step {
     Step::run("install protobuf", "./ci/install-protobuf.sh")
 }
 
+fn protobuf_version_env() -> (String, String) {
+    ("PROTOBUF_VERSION".to_owned(), "3.1.0".to_owned())
+}
+
 fn cargo_doc_job() -> Job {
     let os = LINUX;
     let mut steps = Vec::new();
@@ -54,7 +56,7 @@ fn cargo_doc_job() -> Job {
         id: "cargo-doc".to_owned(),
         name: "cargo doc".to_owned(),
         runs_on: os.ghwf,
-        env: vec![("PROTOBUF_VERSION".to_owned(), "3.1.0".to_owned())],
+        env: vec![protobuf_version_env()],
         steps,
         ..Default::default()
     }
@@ -69,7 +71,10 @@ fn test_protoc_plugin_job() -> Job {
     Job {
         id: "test-protoc-plugin".to_owned(),
         name: "test-protoc-plugin".to_owned(),
-        env: vec![("ACTION".to_owned(), "test-protoc-plugin".to_owned())],
+        env: vec![
+            ("ACTION".to_owned(), "test-protoc-plugin".to_owned()),
+            protobuf_version_env(),
+        ],
         steps,
         ..Default::default()
     }

ci/run.sh

@@ -2,8 +2,6 @@
 
 set -ex
 
-export PROTOBUF_VERSION=3.1.0
-
 rustc --version
 
 export RUST_BACKTRACE=1

grpc/src/client/req_sink.rs

@@ -1,7 +1,8 @@
 use crate::client::types::ClientTypes;
+use crate::common::sink::MessageToBeSerialized;
+use crate::common::sink::SinkCommon;
 use crate::common::sink::SinkCommonUntyped;
 use crate::common::sink::SinkUntyped;
-use crate::common::sink::{MessageToBeSerialized, SinkCommon};
 
 use crate::result;
 use futures::task::Context;

grpc/src/server/method.rs

@@ -2,12 +2,13 @@ use std::sync::Arc;
 
 use crate::common::sink::SinkCommon;
 
+use crate::method::GrpcStreaming;
+use crate::method::GrpcStreamingBidi;
 use crate::method::GrpcStreamingClientStreaming;
 use crate::method::GrpcStreamingFlavor;
 use crate::method::GrpcStreamingServerStreaming;
 use crate::method::GrpcStreamingUnary;
 use crate::method::MethodDescriptor;
-use crate::method::{GrpcStreaming, GrpcStreamingBidi};
 use crate::or_static::arc::ArcOrStatic;
 use crate::or_static::string::StringOrStatic;
 use crate::result;

grpc/src/server/resp_sink_untyped.rs

@@ -1,5 +1,6 @@
+use crate::common::sink::MessageToBeSerialized;
+use crate::common::sink::SinkCommonUntyped;
 use crate::common::sink::SinkUntyped;
-use crate::common::sink::{MessageToBeSerialized, SinkCommonUntyped};
 
 use crate::proto::grpc_status::GrpcStatus;
 use crate::proto::headers::headers_200;

grpc/tests/simple.rs

@@ -11,7 +11,9 @@ use grpc::rt::*;
 use grpc::*;
 
 use futures::executor;
-use futures::{future, TryFutureExt, TryStreamExt};
+use futures::future;
+use futures::TryFutureExt;
+use futures::TryStreamExt;
 use std::thread;
 use test_misc::*;
 

protoc-rust-grpc/src/lib.rs

@@ -9,7 +9,8 @@ use std::fs;
 use std::io;
 use std::io::Read;
 use std::io::Write;
-use std::path::{Path, PathBuf};
+use std::path::Path;
+use std::path::PathBuf;
 
 /// Error type alias.
 pub type Error = io::Error;