From 99c3aa27e6f6daa062b905a65495315c0c2ded90 Mon Sep 17 00:00:00 2001 From: Allen George Date: Sat, 6 Mar 2021 14:11:56 -0500 Subject: Enable clippy in all Rust targets and ensure that all existing code is clippy-clean (#2341) Client: rs --- tutorial/rs/Makefile.am | 1 + tutorial/rs/src/bin/tutorial_server.rs | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tutorial') diff --git a/tutorial/rs/Makefile.am b/tutorial/rs/Makefile.am index 4aa05dada..13f670794 100644 --- a/tutorial/rs/Makefile.am +++ b/tutorial/rs/Makefile.am @@ -25,6 +25,7 @@ gen-rs/tutorial.rs gen-rs/shared.rs: $(top_srcdir)/tutorial/tutorial.thrift all-local: gen-rs/tutorial.rs $(CARGO) build $(CARGO) fmt --all -- --check + $(CARGO) clippy --all -- -D warnings [ -d bin ] || mkdir bin cp target/debug/tutorial_server bin/tutorial_server cp target/debug/tutorial_client bin/tutorial_client diff --git a/tutorial/rs/src/bin/tutorial_server.rs b/tutorial/rs/src/bin/tutorial_server.rs index ad16ab6dc..ab6df57fb 100644 --- a/tutorial/rs/src/bin/tutorial_server.rs +++ b/tutorial/rs/src/bin/tutorial_server.rs @@ -131,11 +131,11 @@ impl CalculatorSyncHandler for CalculatorServer { let num1 = w.num1.as_ref().expect("operands checked"); let num2 = w.num2.as_ref().expect("operands checked"); - match op { - &Operation::ADD => Ok(num1 + num2), - &Operation::SUBTRACT => Ok(num1 - num2), - &Operation::MULTIPLY => Ok(num1 * num2), - &Operation::DIVIDE => { + match *op { + Operation::ADD => Ok(num1 + num2), + Operation::SUBTRACT => Ok(num1 - num2), + Operation::MULTIPLY => Ok(num1 * num2), + Operation::DIVIDE => { if *num2 == 0 { Err(InvalidOperation { what_op: Some(op.into()), -- cgit v1.2.1