Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove nightly FMT #319

Merged
merged 6 commits into from
Nov 8, 2023
Merged

Remove nightly FMT #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b03e71e
remove rustfmt
insipx Nov 8, 2023
a683d6b
Merge branch 'main' of github.com:xmtp/libxmtp into axe-nightly-fmt
insipx Nov 8, 2023
880abc6
default fmt
insipx Nov 8, 2023
6b3c3e2
remove +nightly
insipx Nov 8, 2023
3ae05e2
stable toolchain
insipx Nov 8, 2023
1164827
remove nightly mentions
insipx Nov 8, 2023
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
11 changes: 5 additions & 6 deletions Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
Loading