dev configs

Author: GrigorenkoPV

.envrc

@@ -0,0 +1 @@
+use nix

.gitignore

@@ -17,11 +17,8 @@ Session.vim
 .cproject
 .idea
 *.iml
-.vscode
 .project
 .vim/
-.helix/
-.zed/
 .favorites.json
 .settings/
 .vs/
@@ -34,8 +31,6 @@ Session.vim
 !/tests/run-make/thumb-none-qemu/example/.cargo
 
 ## Configuration
-/bootstrap.toml
-/config.toml
 /Makefile
 config.mk
 config.stamp
@@ -48,7 +43,8 @@ no_llvm_build
 /llvm/
 /mingw-build/
 /build
-/build-rust-analyzer
+/build-rust-analyzer/*
+!/build-rust-analyzer/cache
 /dist/
 /unicode-downloads
 /target
@@ -95,12 +91,10 @@ tests/rustdoc-gui/src/**.lock
 test-dashboard/
 
 ## direnv
-/.envrc
 /.direnv/
 
 ## nix
 /flake.nix
 flake.lock
-/default.nix
 
 # Before adding new lines, see the comment at the top.

.helix/languages.toml

@@ -0,0 +1,54 @@
+# This config uses a separate build directory for rust-analyzer,
+# so that r-a's checks don't block user `x` commands and vice-verse.
+# R-a's build directory is located in `build/rust-analyzer`.
+#
+# To build rustfmt and proc macro server for r-a run the following command:
+# ```
+# x b proc-macro-srv-cli rustfmt --stage 0 --build-dir build/rust-analyzer
+# ```
+
+[language-server.rust-analyzer.config]
+linkedProjects = [
+    "Cargo.toml",
+    # "compiler/rustc_codegen_cranelift/Cargo.toml",
+    # "compiler/rustc_codegen_gcc/Cargo.toml",
+    # "library/Cargo.toml",
+    # "src/bootstrap/Cargo.toml",
+    # "src/tools/rust-analyzer/Cargo.toml",
+]
+
+[language-server.rust-analyzer.config.check]
+invocationLocation = "root"
+invocationStrategy = "once"
+overrideCommand = [
+    "./check.sh",
+    "--json-output",
+]
+
+[language-server.rust-analyzer.config.rustfmt]
+overrideCommand = [
+    "build-rust-analyzer/host/rustfmt/bin/rustfmt",
+    "--edition=2024"
+]
+
+[language-server.rust-analyzer.config.procMacro]
+server = "build-rust-analyzer/host/stage0/libexec/rust-analyzer-proc-macro-srv"
+enable = true
+
+[language-server.rust-analyzer.config.rustc]
+source = "./Cargo.toml"
+
+[language-server.rust-analyzer.config.cargo]
+sysrootSrc = "./library"
+
+[language-server.rust-analyzer.config.cargo.extraEnv]
+RUSTC_BOOTSTRAP = "1"
+
+[language-server.rust-analyzer.config.cargo.buildScripts]
+enable = true
+invocationLocation = "root"
+invocationStrategy = "once"
+overrideCommand = [
+    "./check.sh",
+    "--json-output",
+]

.vscode/settings.json

@@ -0,0 +1,41 @@
+{
+    "git.detectSubmodulesLimit": 20,
+    "rust-analyzer.check.invocationStrategy": "once",
+    "rust-analyzer.check.overrideCommand": [
+        "./check.sh",
+        "--json-output"
+    ],
+    "rust-analyzer.linkedProjects": [
+        "Cargo.toml",
+        // "compiler/rustc_codegen_cranelift/Cargo.toml",
+        // "compiler/rustc_codegen_gcc/Cargo.toml",
+        // "library/Cargo.toml",
+        // "src/bootstrap/Cargo.toml",
+        // "src/tools/rust-analyzer/Cargo.toml"
+    ],
+    "rust-analyzer.rustfmt.overrideCommand": [
+        "${workspaceFolder}/build/host/rustfmt/bin/rustfmt",
+        "--edition=2024"
+    ],
+    "rust-analyzer.procMacro.server": "${workspaceFolder}/build/host/stage0/libexec/rust-analyzer-proc-macro-srv",
+    "rust-analyzer.procMacro.enable": true,
+    "rust-analyzer.cargo.buildScripts.enable": true,
+    "rust-analyzer.cargo.buildScripts.invocationStrategy": "once",
+    "rust-analyzer.cargo.buildScripts.overrideCommand": [
+        "./check.sh",
+        "--json-output"
+    ],
+    "rust-analyzer.cargo.sysrootSrc": "./library",
+    "rust-analyzer.rustc.source": "./Cargo.toml",
+    "rust-analyzer.cargo.extraEnv": {
+        "RUSTC_BOOTSTRAP": "1"
+    },
+    "rust-analyzer.server.extraEnv": {
+        "RUSTUP_TOOLCHAIN": "nightly"
+    },
+    "files.associations": {
+        "*.fixed": "rust",
+        "*.pp": "rust",
+        "*.mir": "rust"
+    }
+}

build-rust-analyzer/cache

@@ -0,0 +1 @@
+../build/cache/

check.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+: "${DIR:="build-rust-analyzer"}"
+exec ./x check --build-dir "${DIR}" "$@"

config.toml

@@ -0,0 +1,36 @@
+# Includes one of the default files in src/bootstrap/defaults
+profile = "compiler"
+change-id = 148795
+
+[llvm]
+download-ci-llvm = true
+assertions = true
+
+[build]
+submodules = false
+# optimized-compiler-builtins = true
+low-priority = true
+
+[rust]
+download-rustc = false
+debug-assertions = true
+
+debug = true
+# verify-llvm-ir = true
+# codegen-backends = ["llvm", "cranelift", "gcc"]
+
+# debuginfo-level = 2
+
+# codegen-units = 2
+incremental = true
+# frame-pointers = true
+
+optimize-tests = false
+verbose-tests = false
+
+deny-warnings = false
+
+backtrace-on-ice = true
+break-on-ice = true
+
+parallel-frontend-threads = 0

shell.nix

@@ -0,0 +1,26 @@
+{
+  pkgs ? import <nixpkgs> { },
+}:
+let
+  inherit (pkgs) lib stdenv;
+in
+pkgs.mkShell {
+  preferLocalBuild = true;
+  allowSubstitutes = false;
+
+  inherit stdenv;
+
+  name = "rustc-dev";
+
+  packages = [
+    stdenv.cc.libc.out
+    stdenv.cc.libc.static
+  ];
+
+  env = {
+    RUSTC_ICE = 0;
+    LD_LIBRARY_PATH = lib.makeLibraryPath [
+      stdenv.cc.cc.lib
+    ];
+  };
+}