fix: use stable rust

Author: aatifsyed

.cargo/config.toml

@@ -1,38 +1,17 @@
-[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"]
+# In all cases, pass --cfg=tokio_unstable for tokio console integration
+# See(https://github.com/ChainSafe/forest/pull/2245)
+# on x86_64-linux-*, most CPUs support the specified vector instructions, so use those
 
-[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"]
+# Note, rustflags aren't additive, so we can't specify tokio_unstable in `build.rustflags`
+# So we use a `cfg(foo)` and `cfg(not(foo))` for our common flags.
+[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))']
+rustflags = ["--cfg=tokio_unstable", "-Ctarget-feature=+avx2,+fma"]
 
-[target.aarch64-apple-darwin]
-rustflags = ["-Zshare-generics=y", "--cfg", "tokio_unstable"]
+[target.'cfg(not(all(target_arch = "x86_64", target_os = "linux")))']
+rustflags = ["--cfg=tokio_unstable"]
 
 [net]
 git-fetch-with-cli = true

.github/workflows/docs.yml

@@ -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 }}

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2023-04-19"
+channel = "1.69"
 components = ["clippy", "llvm-tools-preview", "rustfmt"]
 targets = ["wasm32-unknown-unknown"]