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.

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

Back out 89d57ffb: "build: add rust-toolchain.toml" #5090

Merged
merged 1 commit into from
Dec 12, 2024
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
[workspace.package]
version = "0.24.0"
license = "Apache-2.0"
rust-version = "1.76" # NOTE: remember to update CI, rust-toolchain.toml, contributing.md, changelog.md, install-and-setup.md, and flake.nix
rust-version = "1.76" # NOTE: remember to update CI, contributing.md, changelog.md, install-and-setup.md, and flake.nix
edition = "2021"
readme = "README.md"
homepage = "https://github.com/martinvonz/jj"
Expand Down
18 changes: 5 additions & 13 deletions docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,16 @@ recommended steps.
One-time setup:

rustup toolchain add nightly # wanted for 'rustfmt'
cargo install cargo-insta cargo-watch cargo-nextest
rustup toolchain add 1.76 # also specified in Cargo.toml
cargo install cargo-insta
cargo install cargo-watch
cargo install cargo-nextest

During development (adapt according to your preference):

cargo watch --ignore '.jj/**' -s \
'cargo clippy --workspace --all-targets \
&& cargo check --workspace --all-targets'
&& cargo +1.76 check --workspace --all-targets'
cargo +nightly fmt # Occasionally
cargo nextest run --workspace # Occasionally
cargo insta test --workspace --test-runner nextest # Occasionally
Expand Down Expand Up @@ -186,17 +189,6 @@ These are listed roughly in order of decreasing importance.
On Linux, you may be able to speed up `nextest` even further by using
the `mold` linker, as explained below.

### Using an alternative Rust compiler version

To use a different version of the Rust compiler/toolchain for development, you
can run:

rustup override set 1.80 # or any other version

Or manually set it in individual `cargo` commands:

cargo +1.80 clippy --workspace --all-targets # or any other version

### Using `mold` for faster tests on Linux

On a machine with a multi-core CPU, one way to speed up
Expand Down
4 changes: 0 additions & 4 deletions rust-toolchain.toml

This file was deleted.

Loading