Skip to content

Commit 219e295

Browse files
committedDec 3, 2019
chore: rust checkfmt
1 parent 30748c2 commit 219e295

File tree

5 files changed

+25278
-22428
lines changed

5 files changed

+25278
-22428
lines changed
 

Diff for: ‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ generate: $(GENERATED_TARGETS)
4949
ast/internal/fbast: ast/ast.fbs
5050
$(GO_GENERATE) ./ast
5151
libflux/src/libflux/ast/flatbuffers/ast_generated.rs: ast/ast.fbs
52-
flatc --rust -o libflux/src/libflux/ast/flatbuffers ast/ast.fbs
52+
flatc --rust -o libflux/src/libflux/ast/flatbuffers ast/ast.fbs && rustfmt $@
5353

5454
semantic/internal/fbsemantic: semantic/semantic.fbs
5555
$(GO_GENERATE) ./semantic
5656
libflux/src/libflux/semantic/flatbuffers/semantic_generated.rs: semantic/semantic.fbs
57-
flatc --rust -o libflux/src/libflux/semantic/flatbuffers semantic/semantic.fbs
57+
flatc --rust -o libflux/src/libflux/semantic/flatbuffers semantic/semantic.fbs && rustfmt $@
5858

5959
# Force a second expansion to happen so the call to go_deps works correctly.
6060
.SECONDEXPANSION:

Diff for: ‎etc/checkfmt.sh

+10
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,14 @@ if [ "$HAS_FMT_ERR" -eq "1" ]; then
2626
echo 'run "make fmt"' && \
2727
echo ''
2828
fi
29+
30+
cd libflux
31+
FMT_OUT="$(cargo fmt --all -- --check)"
32+
if [[ -n "$FMT_OUT" ]]; then
33+
echo 'Commit includes files that are not rustfmt-ed' && \
34+
echo 'run "make fmt"' && \
35+
echo ''
36+
HAS_FMT_ERR=1
37+
fi
38+
2939
exit "$HAS_FMT_ERR"

0 commit comments

Comments
 (0)