Skip to content

Commit

Permalink
Remove nightly FMT (#319)
Browse files Browse the repository at this point in the history
* remove rustfmt

* default fmt

* remove +nightly

* stable toolchain

* remove nightly mentions
  • Loading branch information
insipx authored Nov 8, 2023
1 parent 8fd6649 commit 75f59d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@ COPY --chown=xmtp:xmtp --from=builder /home/xmtp/.rustup /home/xmtp/.rustup

USER xmtp

# fmt coming from nightly
RUN ~xmtp/.cargo/bin/rustup toolchain install nightly
RUN ~xmtp/.cargo/bin/rustup component add rustfmt --toolchain nightly
RUN ~xmtp/.cargo/bin/rustup toolchain install stable
RUN ~xmtp/.cargo/bin/rustup component add rustfmt
RUN ~xmtp/.cargo/bin/rustup component add clippy

WORKDIR /workspaces/libxmtp
Expand All @@ -89,8 +88,8 @@ ENV PATH=~xmtp/.cargo/bin:$PATH
ENV USER=xmtp

RUN ~xmtp/.cargo/bin/cargo check
RUN ~xmtp/.cargo/bin/cargo +nightly --version
RUN ~xmtp/.cargo/bin/cargo +nightly fmt --check
RUN ~xmtp/.cargo/bin/cargo --version
RUN ~xmtp/.cargo/bin/cargo fmt --check
RUN ~xmtp/.cargo/bin/cargo clippy --all-features --no-deps
RUN ~xmtp/.cargo/bin/cargo clippy --all-features --no-deps --manifest-path xmtp/Cargo.toml
# some tests are setup as integration tests 👀 xmtp_mls
Expand All @@ -105,4 +104,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vendor="xmtp" \
org.label-schema.version=$VERSION \
org.label-schema.schema-version="1.0" \
org.opencontainers.image.description="Rust Development Container"
org.opencontainers.image.description="Rust Development Container"
6 changes: 0 additions & 6 deletions rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
imports_granularity = "Crate"
# Match rust-analyzer auto-imports
group_imports = "StdExternalCrate"
comment_width = 100
format_code_in_doc_comments = true
wrap_comments = true

0 comments on commit 75f59d0

Please sign in to comment.