Rename rust-toolchain to rust-toolchain.toml

.github/workflows/ci.yml

@@ -52,7 +52,9 @@ jobs:
 
     - name: Install packages
       # `llvm-14-tools` is needed to install the `FileCheck` binary which is used for asm tests.
-      run: sudo apt-get install ninja-build ripgrep llvm-14-tools llvm
+      run: |
+        sudo apt-get update
+        sudo apt-get install ninja-build ripgrep llvm-14-tools llvm
 
     - name: Install the libraries needed to build librsvg
       if: ${{ contains(matrix.commands, '--projects') }}

Readme.md

@@ -154,7 +154,7 @@ If you compiled `cg_gcc` in debug mode (aka you didn't pass `--release` to `./y.
 You can do the same manually (although we don't recommend it):
 
 ```bash
-$ LIBRARY_PATH="[gcc-path value]" LD_LIBRARY_PATH="[gcc-path value]" rustc +$(cat $CG_GCCJIT_DIR/rust-toolchain | grep 'channel' | cut -d '=' -f 2 | sed 's/"//g' | sed 's/ //g') -Cpanic=abort -Zcodegen-backend=$CG_GCCJIT_DIR/target/release/librustc_codegen_gcc.so --sysroot $CG_GCCJIT_DIR/build_sysroot/sysroot my_crate.rs
+$ LIBRARY_PATH="[gcc-path value]" LD_LIBRARY_PATH="[gcc-path value]" rustc +$(cat $CG_GCCJIT_DIR/rust-toolchain.toml | grep 'channel' | cut -d '=' -f 2 | sed 's/"//g' | sed 's/ //g') -Cpanic=abort -Zcodegen-backend=$CG_GCCJIT_DIR/target/release/librustc_codegen_gcc.so --sysroot $CG_GCCJIT_DIR/build_sysroot/sysroot my_crate.rs
 ```
 
 ## Environment variables

build_system/src/abi_test.rs

@@ -34,7 +34,7 @@ pub fn run() -> Result<(), String> {
     .map_err(|err| format!("Git clone failed with message: {err:?}!"))?;
     // Configure abi-cafe to use the exact same rustc version we use - this is crucial.
     // Otherwise, the concept of ABI compatibility becomes meanignless.
-    std::fs::copy("rust-toolchain", "clones/abi-cafe/rust-toolchain")
+    std::fs::copy("rust-toolchain.toml", "clones/abi-cafe/rust-toolchain.toml")
         .expect("Could not copy toolchain configs!");
     // Get the backend path.
     // We will use the *debug* build of the backend - it has more checks enabled.

build_system/src/utils.rs

@@ -242,9 +242,9 @@ fn rustc_version_info_inner(
 }
 
 pub fn get_toolchain() -> Result<String, String> {
-    let content = match fs::read_to_string("rust-toolchain") {
+    let content = match fs::read_to_string("rust-toolchain.toml") {
         Ok(content) => content,
-        Err(_) => return Err("No `rust-toolchain` file found".to_string()),
+        Err(_) => return Err("No `rust-toolchain.toml` file found".to_string()),
     };
     match content
         .split('\n')
@@ -259,7 +259,7 @@ pub fn get_toolchain() -> Result<String, String> {
         .next()
     {
         Some(toolchain) => Ok(toolchain.to_string()),
-        None => Err("Couldn't find `channel` in `rust-toolchain` file".to_string()),
+        None => Err("Couldn't find `channel` in `rust-toolchain.toml` file".to_string()),
     }
 }
 

doc/tips.md

@@ -41,7 +41,7 @@ COLLECT_NO_DEMANGLE=1
 ### How to use a custom-build rustc
 
  * Build the stage2 compiler (`rustup toolchain link debug-current build/x86_64-unknown-linux-gnu/stage2`).
- * Clean and rebuild the codegen with `debug-current` in the file `rust-toolchain`.
+ * Clean and rebuild the codegen with `debug-current` in the file `rust-toolchain.toml`.
 
 ### How to use a custom sysroot source path