Skip to content

Commit

Permalink
fix: use stable rust
Browse files Browse the repository at this point in the history
  • Loading branch information
aatifsyed committed May 15, 2023
1 parent fb8c54c commit 687d538
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 35 deletions.
37 changes: 5 additions & 32 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,11 @@
[alias]
b = "build"
c = "check"
d = "doc"
t = "test"
r = "run"

[build]
incremental = true
# might be helpful but we don't enforce sccache installation atm
# https://github.com/mozilla/sccache
# rustc-wrapper = "sccache"

# For details checkout https://jondot.medium.com/8-steps-for-troubleshooting-your-rust-build-times-2ffc965fd13e
[target.x86_64-unknown-linux-gnu]
# clang has been listed as prerequisite in the doc
linker = "clang"
# enable avx2 by default since it's avaiable on almost all x86_64 CPUs
rustflags = ["-Ctarget-feature=+avx2,+fma", "-Zshare-generics=y", "--cfg", "tokio_unstable"]

[target.x86_64-unknown-linux-musl]
# clang has been listed as prerequisite in the doc
linker = "clang"
# enable avx2 by default since it's avaiable on almost all x86_64 CPUs
rustflags = ["-Ctarget-feature=+avx2,+fma", "-Zshare-generics=y", "--cfg", "tokio_unstable"]

[target.x86_64-apple-darwin]
# zld might help here
# brew install michaeleisel/zld/zld
# "-Clink-arg=-fuse-ld=zld"
# For details checkout https://jondot.medium.com/8-steps-for-troubleshooting-your-rust-build-times-2ffc965fd13e
rustflags = ["-Zshare-generics=y", "--cfg", "tokio_unstable"]
# Tokio console integration
# https://github.com/ChainSafe/forest/pull/2245
rustflags = ["--cfg=tokio_unstable"]

[target.aarch64-apple-darwin]
rustflags = ["-Zshare-generics=y", "--cfg", "tokio_unstable"]
[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))']
rustflags = ["-Ctarget-feature=+avx2,+fma"]

[net]
git-fetch-with-cli = true
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ on:
- main

env:
# https://doc.rust-lang.org/nightly/rustdoc/unstable-features.html#--index-page-provide-a-top-level-landing-page-for-docs
RUSTDOCFLAGS: "-Dwarnings -Zunstable-options --enable-index-page"
RUSTDOCFLAGS: "-Dwarnings"
CACHE_TIMEOUT_MINUTES: 5
SCCACHE_ENDPOINT: ${{ vars.SCCACHE_ENDPOINT }}
SCCACHE_BUCKET: ${{ vars.SCCACHE_BUCKET }}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-04-19"
channel = "1.69"
components = ["clippy", "llvm-tools-preview", "rustfmt"]
targets = ["wasm32-unknown-unknown"]

0 comments on commit 687d538

Please sign in to comment.