summaryrefslogtreecommitdiff
path: root/tutorial
diff options
context:
space:
mode:
authorAllen George <allengeorge@apache.org>2021-03-01 23:19:52 -0500
committerGitHub <noreply@github.com>2021-03-01 23:19:52 -0500
commit55c3e4c2eff86b61eae1b098803e72d682bdaafb (patch)
treebf8f63ef1cdc0678c7ecbed0be8d4dbd8c179fbb /tutorial
parent1ab156ab17b6f3268a1ba57034b4d4dc96f4f306 (diff)
downloadthrift-55c3e4c2eff86b61eae1b098803e72d682bdaafb.tar.gz
Reformat rust code using 1.40 rustfmt and fail build if rustfmt fails (#2339)
Diffstat (limited to 'tutorial')
-rw-r--r--tutorial/rs/Makefile.am1
-rw-r--r--tutorial/rs/src/bin/tutorial_server.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/tutorial/rs/Makefile.am b/tutorial/rs/Makefile.am
index 666331e4a..4aa05dada 100644
--- a/tutorial/rs/Makefile.am
+++ b/tutorial/rs/Makefile.am
@@ -24,6 +24,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
[ -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 b6ed7a123..ad16ab6dc 100644
--- a/tutorial/rs/src/bin/tutorial_server.rs
+++ b/tutorial/rs/src/bin/tutorial_server.rs
@@ -144,7 +144,7 @@ impl CalculatorSyncHandler for CalculatorServer {
} else {
Ok(num1 / num2)
}
- },
+ }
_ => {
let op_val: i32 = op.into();
Err(InvalidOperation {