THRIFT-5306: Rust code and generated code no longer has clippy warnings (Rust 1.40)
Client: rs
NOTE: Also properly update the min/max supported Rust versions
diff --git a/test/rs/Cargo.toml b/test/rs/Cargo.toml
index deffd21..8a85d7c 100644
--- a/test/rs/Cargo.toml
+++ b/test/rs/Cargo.toml
@@ -8,10 +8,8 @@
[dependencies]
clap = "2.33"
-env_logger = "0.4.0"
+env_logger = "0.8"
log = "0.4"
-ordered-float = "1.0"
-try_from = "0.3"
[dependencies.thrift]
path = "../../lib/rs"
diff --git a/test/rs/src/bin/test_client.rs b/test/rs/src/bin/test_client.rs
index 3206deb..6cbc238 100644
--- a/test/rs/src/bin/test_client.rs
+++ b/test/rs/src/bin/test_client.rs
@@ -15,20 +15,15 @@
// specific language governing permissions and limitations
// under the License.
-#[macro_use]
-extern crate log;
-extern crate env_logger;
+use env_logger;
+use log::*;
+use clap::{clap_app, value_t};
-#[macro_use]
-extern crate clap;
-extern crate ordered_float;
-extern crate thrift;
-extern crate thrift_test; // huh. I have to do this to use my lib
-
-use ordered_float::OrderedFloat;
use std::collections::{BTreeMap, BTreeSet};
use std::fmt::Debug;
+use thrift;
+use thrift::OrderedFloat;
use thrift::protocol::{TBinaryInputProtocol, TBinaryOutputProtocol, TCompactInputProtocol,
TCompactOutputProtocol, TInputProtocol, TMultiplexedOutputProtocol,
TOutputProtocol};
@@ -38,7 +33,7 @@
use thrift_test::*;
fn main() {
- env_logger::init().expect("logger setup failed");
+ env_logger::init();
debug!("initialized logger - running cross-test client");
@@ -167,7 +162,7 @@
type BuildThriftTestClient = ThriftTestSyncClient<Box<dyn TInputProtocol>, Box<dyn TOutputProtocol>>;
type BuiltSecondServiceClient = SecondServiceSyncClient<Box<dyn TInputProtocol>, Box<dyn TOutputProtocol>>;
-#[cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))]
+#[allow(clippy::cognitive_complexity)]
fn make_thrift_calls(
thrift_test_client: &mut BuildThriftTestClient,
second_service_client: &mut Option<BuiltSecondServiceClient>,
@@ -191,7 +186,7 @@
verify_expected_result(thrift_test_client.test_byte(42), 42)?;
info!("testi32");
- verify_expected_result(thrift_test_client.test_i32(1159348374), 1159348374)?;
+ verify_expected_result(thrift_test_client.test_i32(1_159_348_374), 1_159_348_374)?;
info!("testi64");
// try!(verify_expected_result(thrift_test_client.test_i64(-8651829879438294565),
@@ -231,14 +226,14 @@
let x_snd = Xtruct {
string_thing: Some("foo".to_owned()),
byte_thing: Some(12),
- i32_thing: Some(219129),
- i64_thing: Some(12938492818),
+ i32_thing: Some(219_129),
+ i64_thing: Some(12_938_492_818),
};
let x_cmp = Xtruct {
string_thing: Some("foo".to_owned()),
byte_thing: Some(12),
- i32_thing: Some(219129),
- i64_thing: Some(12938492818),
+ i32_thing: Some(219_129),
+ i64_thing: Some(12_938_492_818),
};
verify_expected_result(thrift_test_client.test_struct(x_snd), x_cmp)?;
}
@@ -264,11 +259,11 @@
Xtruct {
string_thing: Some("foo".to_owned()),
byte_thing: Some(1),
- i32_thing: Some(324382098),
- i64_thing: Some(12938492818),
+ i32_thing: Some(324_382_098),
+ i64_thing: Some(12_938_492_818),
},
),
- i32_thing: Some(293481098),
+ i32_thing: Some(293_481_098),
};
let x_cmp = Xtruct2 {
byte_thing: Some(32),
@@ -276,11 +271,11 @@
Xtruct {
string_thing: Some("foo".to_owned()),
byte_thing: Some(1),
- i32_thing: Some(324382098),
- i64_thing: Some(12938492818),
+ i32_thing: Some(324_382_098),
+ i64_thing: Some(12_938_492_818),
},
),
- i32_thing: Some(293481098),
+ i32_thing: Some(293_481_098),
};
verify_expected_result(thrift_test_client.test_nest(x_snd), x_cmp)?;
}
@@ -314,12 +309,12 @@
info!("testSet");
{
let mut s_snd: BTreeSet<i32> = BTreeSet::new();
- s_snd.insert(293481);
+ s_snd.insert(293_481);
s_snd.insert(23);
s_snd.insert(3234);
let mut s_cmp: BTreeSet<i32> = BTreeSet::new();
- s_cmp.insert(293481);
+ s_cmp.insert(293_481);
s_cmp.insert(23);
s_cmp.insert(3234);
@@ -386,12 +381,12 @@
let s_cmp = Xtruct {
string_thing: Some("Hello2".to_owned()),
byte_thing: Some(1),
- i32_thing: Some(-123948),
- i64_thing: Some(-19234123981),
+ i32_thing: Some(-123_948),
+ i64_thing: Some(-19_234_123_981),
};
verify_expected_result(
- thrift_test_client.test_multi(1, -123948, -19234123981, m_snd, Numberz::Eight, 81),
+ thrift_test_client.test_multi(1, -123_948, -19_234_123_981, m_snd, Numberz::Eight, 81),
s_cmp,
)?;
}
@@ -429,8 +424,8 @@
Xtruct {
string_thing: Some("baz".to_owned()),
byte_thing: Some(0),
- i32_thing: Some(3948539),
- i64_thing: Some(-12938492),
+ i32_thing: Some(3_948_539),
+ i64_thing: Some(-12_938_492),
},
);
@@ -453,7 +448,7 @@
s_cmp.insert(1 as UserId, s_cmp_nested_1);
s_cmp.insert(2 as UserId, s_cmp_nested_2);
- verify_expected_result(thrift_test_client.test_insanity(insanity.clone()), s_cmp)?;
+ verify_expected_result(thrift_test_client.test_insanity(insanity), s_cmp)?;
}
info!("testException - remote throws Xception");
@@ -583,7 +578,6 @@
thrift_test_client.test_void()
}
-#[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
fn verify_expected_result<T: Debug + PartialEq + Sized>(
actual: Result<T, thrift::Error>,
expected: T,
diff --git a/test/rs/src/bin/test_server.rs b/test/rs/src/bin/test_server.rs
index e57cc14..74be12d 100644
--- a/test/rs/src/bin/test_server.rs
+++ b/test/rs/src/bin/test_server.rs
@@ -15,21 +15,16 @@
// specific language governing permissions and limitations
// under the License.
-#[macro_use]
-extern crate log;
-extern crate env_logger;
+use env_logger;
+use log::*;
+use clap::{clap_app, value_t};
-#[macro_use]
-extern crate clap;
-extern crate ordered_float;
-extern crate thrift;
-extern crate thrift_test;
-
-use ordered_float::OrderedFloat;
use std::collections::{BTreeMap, BTreeSet};
use std::thread;
use std::time::Duration;
+use thrift;
+use thrift::OrderedFloat;
use thrift::protocol::{TBinaryInputProtocolFactory, TBinaryOutputProtocolFactory,
TCompactInputProtocolFactory, TCompactOutputProtocolFactory,
TInputProtocolFactory, TOutputProtocolFactory};
@@ -40,7 +35,7 @@
use thrift_test::*;
fn main() {
- env_logger::init().expect("logger setup failed");
+ env_logger::init();
debug!("initialized logger - running cross-test server");
@@ -274,7 +269,7 @@
info!("testInsanity({:?})", argument);
let mut map_0: BTreeMap<Numberz, Insanity> = BTreeMap::new();
map_0.insert(Numberz::Two, argument.clone());
- map_0.insert(Numberz::Three, argument.clone());
+ map_0.insert(Numberz::Three, argument);
let mut map_1: BTreeMap<Numberz, Insanity> = BTreeMap::new();
let insanity = Insanity {
diff --git a/test/rs/src/lib.rs b/test/rs/src/lib.rs
index 10523f0..3c7cfc0 100644
--- a/test/rs/src/lib.rs
+++ b/test/rs/src/lib.rs
@@ -15,9 +15,9 @@
// specific language governing permissions and limitations
// under the License.
-extern crate ordered_float;
-extern crate thrift;
-extern crate try_from;
+
+
+
mod thrift_test;
pub use crate::thrift_test::*;