diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
new file mode 100644
index 00000000..92caff79
--- /dev/null
+++ b/.github/workflows/format.yml
@@ -0,0 +1,12 @@
+name: Format
+on: [push, pull_request]
+jobs:
+  all:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hecrj/setup-rust-action@v1
+      with:
+        components: rustfmt
+    - uses: actions/checkout@master
+    - name: Check format
+      run: cargo fmt --all -- --check
diff --git a/rustfmt.toml b/rustfmt.toml
index 7e5dded7..d979d317 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,3 +1 @@
 max_width=80
-wrap_comments=true
-merge_imports=true