Merge pull request #3 from runtimeverification/resync

Author: sskeirik

.clang-format

@@ -0,0 +1 @@
+BasedOnStyle:  LLVM

.git-blame-ignore-revs

@@ -23,3 +23,9 @@ b2d2184edea578109a48ec3d8decbee5948e8f35
 # test directives migration
 6e48b96692d63a79a14563f27fe5185f122434f8
 ec2cc761bc7067712ecc7734502f703fe3b024c8
+# format use declarations
+84ac80f1921afc243d71fd0caaa4f2838c294102
+# bless mir-opt tests to add `copy`
+99cb0c6bc399fb94a0ddde7e9b38e9c00d523bad
+# reformat with rustfmt edition 2024
+c682aa162b0d41e21cc6748f4fecfe01efb69d1f

.github/ISSUE_TEMPLATE/blank_issue.md

@@ -1,3 +1,4 @@
+<!-- homu-ignore:start -->
 <!--
 If this PR is related to an unstable feature or an otherwise tracked effort,
 please link to the relevant tracking issue here. If you don't know of a related
@@ -6,5 +7,6 @@ tracking issue or there are none, feel free to ignore this.
 This PR will get automatically assigned to a reviewer. In case you would like
 a specific user to review your work, you can assign it to them by using
 
-    r​? <reviewer name>
--->
+    r\? <reviewer name> (with the `\` removed)
+-->
+<!-- homu-ignore:end -->

.github/pull_request_template.md

@@ -38,6 +38,8 @@ concurrency:
   cancel-in-progress: true
 env:
   TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
+  # This will be empty in PR jobs.
+  TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
 jobs:
   # The job matrix for `calculate_matrix` is defined in src/ci/github-actions/jobs.yml.
   # It calculates which jobs should be executed, based on the data of the ${{ github }} context.
@@ -63,7 +65,7 @@ jobs:
     defaults:
       run:
         shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
-    timeout-minutes: 600
+    timeout-minutes: 240
     env:
       CI_JOB_NAME: ${{ matrix.image }}
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
@@ -93,8 +95,6 @@ jobs:
           path-type: inherit
           install: >
             make
-            dos2unix
-            diffutils
 
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
@@ -104,6 +104,18 @@ jobs:
         with:
           fetch-depth: 2
 
+      # Free up disk space on Linux by removing preinstalled components that
+      # we do not need. We do this to enable some of the less resource
+      # intensive jobs to run on free runners, which however also have
+      # less disk space.
+      - name: free up disk space
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
+        if: contains(matrix.os, 'ubuntu')
+        with:
+          # Removing packages with APT saves ~5 GiB, but takes several
+          # minutes (and potentially removes important packages).
+          large-packages: false
+
       # Rust Log Analyzer can't currently detect the PR number of a GitHub
       # Actions build on its own, so a hint in the log message is needed to
       # point it in the right direction.
@@ -122,6 +134,9 @@ jobs:
           # which then uses log commands to actually set them.
           EXTRA_VARIABLES: ${{ toJson(matrix.env) }}
 
+      - name: setup upstream remote
+        run: src/ci/scripts/setup-upstream-remote.sh
+
       - name: ensure the channel matches the target branch
         run: src/ci/scripts/verify-channel.sh
 
@@ -154,12 +169,6 @@ jobs:
 
       - name: checkout submodules
         run: src/ci/scripts/checkout-submodules.sh
-      
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-        if: runner.environment == 'github-hosted'
 
       - name: install MinGW
         run: src/ci/scripts/install-mingw.sh
@@ -197,6 +206,11 @@ jobs:
       - name: create github artifacts
         run: src/ci/scripts/create-doc-artifacts.sh
 
+      - name: print disk usage
+        run: |
+          echo "disk usage:"
+          df -h
+
       - name: upload artifacts to github
         uses: actions/upload-artifact@v4
         with:
@@ -218,6 +232,16 @@ jobs:
         # erroring about invalid credentials instead.
         if: github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1'
 
+      - name: upload job metrics to DataDog
+        if: needs.calculate_matrix.outputs.run_type != 'pr'
+        env:
+          DATADOG_SITE: datadoghq.com
+          DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
+          DD_GITHUB_JOB_NAME: ${{ matrix.name }}
+        run: |
+          npm install -g @datadog/datadog-ci@^2.x.x
+          python3 src/ci/scripts/upload-build-metrics.py build/cpu-usage.csv
+
   # This job isused to tell bors the final status of the build, as there is no practical way to detect
   # when a workflow is successful listening to webhooks only in our current bors implementation (homu).
   outcome:
@@ -242,6 +266,5 @@ jobs:
         shell: bash
         if: needs.calculate_matrix.outputs.run_type == 'auto'
         env:
-          TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
           TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
           TOOLSTATE_PUBLISH: 1

.github/workflows/ci.yml

@@ -61,14 +61,27 @@ jobs:
           rustup toolchain install --no-self-update --profile minimal $TOOLCHAIN
           rustup default $TOOLCHAIN
 
-      - name: cargo update
+      - name: cargo update compiler & tools
         # Remove first line that always just says "Updating crates.io index"
-        run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
+        run: |
+          echo -e "\ncompiler & tools dependencies:" >> cargo_update.log
+          cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
+      - name: cargo update library
+        run: |
+          echo -e "\nlibrary dependencies:" >> cargo_update.log
+          cargo update --manifest-path library/Cargo.toml 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
+      - name: cargo update rustbook
+        run: |
+          echo -e "\nrustbook dependencies:" >> cargo_update.log
+          cargo update --manifest-path src/tools/rustbook/Cargo.toml 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
       - name: upload Cargo.lock artifact for use in PR
         uses: actions/upload-artifact@v4
         with:
           name: Cargo-lock
-          path: Cargo.lock
+          path: |
+            Cargo.lock
+            library/Cargo.lock
+            src/tools/rustbook/Cargo.lock
           retention-days: 1
       - name: upload cargo-update log artifact for use in PR
         uses: actions/upload-artifact@v4
@@ -113,7 +126,7 @@ jobs:
           git config user.name github-actions
           git config user.email [email protected]
           git switch --force-create cargo_update
-          git add ./Cargo.lock
+          git add ./Cargo.lock ./library/Cargo.lock ./src/tools/rustbook/Cargo.lock
           git commit --no-verify --file=commit.txt
 
       - name: push

.github/workflows/dependencies.yml

@@ -19,9 +19,13 @@ Session.vim
 *.iml
 .vscode
 .project
+.vim/
+.helix/
+.zed/
 .favorites.json
 .settings/
 .vs/
+.dir-locals.el
 
 ## Tool
 .valgrindrc
@@ -48,10 +52,16 @@ build/
 /dist/
 /unicode-downloads
 /target
+/library/target
 /src/bootstrap/target
 /src/tools/x/target
 # Created by default with `src/ci/docker/run.sh`
 /obj/
+# Created by nix dev shell / .envrc
+src/tools/nix-dev-shell/flake.lock
+
+## ICE reports
+rustc-ice-*.txt
 
 ## Temporary files
 *~
@@ -78,4 +88,13 @@ package.json
 ## Rustdoc GUI tests
 tests/rustdoc-gui/src/**.lock
 
+## direnv
+.envrc
+.direnv/
+
+## nix
+flake.nix
+flake.lock
+default.nix
+
 # Before adding new lines, see the comment at the top.

.gitignore

@@ -33,7 +33,7 @@
 [submodule "src/llvm-project"]
 	path = src/llvm-project
 	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/18.1-2024-05-19
+	branch = rustc/19.1-2024-09-17
 	shallow = true
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book
@@ -47,3 +47,11 @@
 	path = src/tools/rustc-perf
 	url = https://github.com/rust-lang/rustc-perf.git
 	shallow = true
+[submodule "src/tools/enzyme"]
+	path = src/tools/enzyme
+	url = https://github.com/EnzymeAD/Enzyme.git
+	shallow = true
+[submodule "src/gcc"]
+	path = src/gcc
+	url = https://github.com/rust-lang/gcc.git
+	shallow = true

.gitmodules

@@ -0,0 +1,2 @@
+# Make vscode *not* count `config.toml` as ignored, so it is included in search
+!/config.toml

.ignore

@@ -74,13 +74,15 @@ Ben Striegel <[email protected]>
 Benjamin Jackman <[email protected]>
 Benoît Cortier <[email protected]>
 Bheesham Persaud <[email protected]> Bheesham Persaud <[email protected]>
+bjorn3 <[email protected]> <[email protected]>
 Björn Steinbrink <[email protected]> <[email protected]>
 blake2-ppc <[email protected]> <blake2-ppc>
 blyxyas <[email protected]> Alejandra González <[email protected]>
 boolean_coercion <[email protected]>
 Boris Egorov <[email protected]> <[email protected]>
 bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
 bors <[email protected]> bors[bot] <bors[bot]@users.noreply.github.com>
+Boxy <[email protected]> <[email protected]>
 Braden Nelson <[email protected]>
 Brandon Sanderson <[email protected]> Brandon Sanderson <[email protected]>
 Brett Cannon <[email protected]> Brett Cannon <[email protected]>
@@ -146,6 +148,7 @@ David Klein <[email protected]>
 David Manescu <[email protected]> <[email protected]>
 David Ross <[email protected]>
 David Wood <[email protected]> <[email protected]>
+David Wood <[email protected]> <[email protected]>
 Deadbeef <[email protected]>
 Deadbeef <[email protected]> <[email protected]>
 dependabot[bot] <dependabot[bot]@users.noreply.github.com> <27856297+dependabot-preview[bot]@users.noreply.github.com>
@@ -253,6 +256,7 @@ Jakub Adam Wieczorek <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
+Jakub Beránek <[email protected]> <[email protected]>
 James [Undefined] <[email protected]>
 James Deng <[email protected]> <[email protected]>
 James Hinshelwood <[email protected]> <[email protected]>
@@ -277,6 +281,7 @@ Jerry Hardee <[email protected]>
 Jesús Rubio <[email protected]>
 Jethro Beekman <[email protected]>
 Jian Zeng <[email protected]>
+Jieyou Xu <[email protected]> <[email protected]>
 Jihyun Yu <[email protected]> <[email protected]>
 Jihyun Yu <[email protected]> jihyun <[email protected]>
 Jihyun Yu <[email protected]> Jihyun Yu <[email protected]>
@@ -309,6 +314,7 @@ Josh Driver <[email protected]>
 Josh Holmer <[email protected]>
 Josh Stone <[email protected]> <[email protected]>
 Josh Stone <[email protected]> <[email protected]>
+Julia Ryan <[email protected]> <[email protected]>
 Julian Knodt <[email protected]>
 jumbatm <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
@@ -379,6 +385,7 @@ Markus Westerlind <[email protected]> Markus <[email protected]>
 Martin Carton <[email protected]>
 Martin Habovštiak <[email protected]>
 Martin Hafskjold Thoresen <[email protected]>
+Martin Nordholts <[email protected]> <[email protected]>
 Matej Lach <[email protected]> Matej Ľach <[email protected]>
 Mateusz Mikuła <[email protected]>
 Mateusz Mikuła <[email protected]> <[email protected]>
@@ -434,7 +441,7 @@ Nick Platt <[email protected]>
 Niclas Schwarzlose <[email protected]>
 Nicolas Abram <[email protected]>
 Nicole Mazzuca <[email protected]>
-Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> nils <[email protected]>
+Noratrieb <48135649+Noratrieb@users.noreply.github.com> <[email protected]>
 Nif Ward <[email protected]>
 Nika Layzell <[email protected]> <[email protected]>
 NODA Kai <[email protected]>