From 724bf3231783a659b75037174991630b45f6e799 Mon Sep 17 00:00:00 2001
From: "Adam C. Foltzer" <acfoltzer@fastly.com>
Date: Wed, 18 Sep 2019 16:27:02 -0700
Subject: [PATCH] switch to nightly-2019-09-25, the most recent with all
 components

---
 Dockerfile              | 4 ++--
 helpers/indent.sh       | 6 ++++--
 lucet-idl/src/parser.rs | 1 -
 lucetc/src/module.rs    | 3 ++-
 rust-toolchain          | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 91f832727..5cf8e6e49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,11 +28,11 @@ RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100
 ENV LD_LIBRARY_PATH=/usr/local/lib
 
 RUN curl https://sh.rustup.rs -sSf | \
-    sh -s -- --default-toolchain 1.36.0 -y && \
+    sh -s -- --default-toolchain nightly-2019-09-25 -y && \
         /root/.cargo/bin/rustup update nightly
 ENV PATH=/root/.cargo/bin:$PATH
 
-RUN rustup component add rustfmt --toolchain 1.36.0-x86_64-unknown-linux-gnu
+RUN rustup component add rustfmt --toolchain nightly-2019-09-25-x86_64-unknown-linux-gnu
 RUN rustup target add wasm32-wasi
 
 RUN cargo install --debug cargo-audit cargo-watch rsign2
diff --git a/helpers/indent.sh b/helpers/indent.sh
index 654755184..2c0d8dc80 100755
--- a/helpers/indent.sh
+++ b/helpers/indent.sh
@@ -10,8 +10,10 @@ cleanup() {
 }
 trap cleanup 1 2 3 6 15
 
-if ! rustfmt --version | grep -q "rustfmt 1.2.2-stable"; then
-	echo "indent requires rustfmt 1.2.2-stable"
+RUSTFMT_VERSION=1.4.8-nightly
+
+if ! rustfmt --version | grep -q "rustfmt $RUSTFMT_VERSION"; then
+	echo "indent requires rustfmt $RUSTFMT_VERSION"
 	exit 1
 fi
 
diff --git a/lucet-idl/src/parser.rs b/lucet-idl/src/parser.rs
index 07d4948b1..e076e5230 100644
--- a/lucet-idl/src/parser.rs
+++ b/lucet-idl/src/parser.rs
@@ -1198,5 +1198,4 @@ mod tests {
             }
         );
     }
-
 }
diff --git a/lucetc/src/module.rs b/lucetc/src/module.rs
index 9a1e995bd..a72ef1b9f 100644
--- a/lucetc/src/module.rs
+++ b/lucetc/src/module.rs
@@ -369,7 +369,8 @@ impl<'a> ModuleEnvironment<'a> for ModuleInfo<'a> {
                     self.tables.push(Exportable::new(table));
                     vac.insert(vec![table_elems]);
                 } else {
-                    panic!("creation of elements for undeclared table! only table 0 is implicitly declared") // Do we implicitly declare them all???? i sure hope not
+                    panic!("creation of elements for undeclared table! only table 0 is implicitly declared")
+                    // Do we implicitly declare them all???? i sure hope not
                 }
             }
         }
diff --git a/rust-toolchain b/rust-toolchain
index 39fc130ef..9e495a9f7 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.36.0
+nightly-2019-09-25