Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions helpers/indent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion lucet-idl/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1198,5 +1198,4 @@ mod tests {
}
);
}

}
3 changes: 2 additions & 1 deletion lucetc/src/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.36.0
nightly-2019-09-25