Merge remote-tracking branch 'origin/main' into verify-intrinsics

# Conflicts:
#	library/core/src/intrinsics.rs

.github/TOOL_REQUEST_TEMPLATE.md

@@ -0,0 +1,31 @@
+_The following form is designed to provide information for your tool that should be included in the effort to verify the Rust standard library. Please note that the tool will need to be **supported** if it is to be included._
+
+## Tool Name
+_Please enter your tool name here._
+
+## Description
+_Please enter a description for your tool and any information you deem relevant._
+
+## Tool Information
+
+* [ ] Does the tool perform Rust verification? 
+* [ ] Does the tool deal with *unsafe* Rust code? 
+* [ ] Does the tool run independently in CI? 
+* [ ] Is the tool open source?
+* [ ] Is the tool under development? 
+* [ ] Will you or your team be able to provide support for the tool?
+
+## Licenses
+_Please list the license(s) that are used by your tool, and if to your knowledge they conflict with the Rust standard library license(s)._
+
+## Steps to Use the Tool
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+## Artifacts
+_If there are noteworthy examples of using the tool to perform verificaiton, please include them in this section.Links, papers, etc._
+
+## CI & Versioning
+_Please describe how you version the tool and how it will be supported in CI pipelines._

.github/pull_requests.toml

@@ -9,5 +9,8 @@ members = [
  "remi-delmas-3000",
  "qinheping",
  "tautschnig",
- "jaisnan"
+ "jaisnan",
+ "patricklam",
+ "ranjitjhala",
+ "carolynzech"
 ]

.github/workflows/kani.yml

@@ -9,6 +9,7 @@ on:
  paths:
  - 'library/**'
  - '.github/workflows/kani.yml'
+ - 'scripts/check_kani.sh'
 
 defaults:
  run:
@@ -30,32 +31,8 @@ jobs:
  - name: Checkout Library
  uses: actions/checkout@v4
  with:
- path: verify-rust-std
+ path: head
  submodules: true
 
- # We currently build Kani from a branch that tracks a rustc version compatible with this library version.
- - name: Checkout `Kani`
- uses: actions/checkout@v4
- with:
- repository: model-checking/kani
- path: kani
- ref: features/verify-rust-std
-
- - name: Setup Dependencies
- working-directory: kani
- run: |
- ./scripts/setup/${{ matrix.base }}/install_deps.sh
-
- - name: Build `Kani`
- working-directory: kani
- run: |
- cargo build-dev --release
- echo "$(pwd)/scripts" >> $GITHUB_PATH
-
- - name: Run tests
- working-directory: verify-rust-std
- env:
- RUST_BACKTRACE: 1
- run: |
- kani verify-std -Z unstable-options ./library --target-dir ${{ runner.temp }} -Z function-contracts \
- -Z mem-predicates -Z ptr-to-ref-cast-checks
+ - name: Run Kani Script
+ run: bash ./head/scripts/check_kani.sh ${{github.workspace}}/head

.github/workflows/pr_approval.yml

@@ -7,16 +7,9 @@ name: Check PR Approvals
 on:
  pull_request_review:
  types: [submitted]
- workflow_dispatch:
-
-# Without these permissions, we get a 403 error from github
-# for trying to modify the pull request for newer project.
-# Source: https://stackoverflow.com/a/76994510
-permissions: write-all
 
 jobs:
  check-approvals:
- if: github.event.review.state == 'APPROVED' || github.event_name == 'workflow_dispatch'
  runs-on: ubuntu-latest
  steps:
  - name: Checkout repository
@@ -51,22 +44,6 @@ jobs:
  pull_number = context.issue.number;
  }
 
- // Get PR files
- const files = await github.rest.pulls.listFiles({
- owner,
- repo,
- pull_number
- });
-
- const relevantPaths = ['library/', 'doc/src/challenges/'];
- const isRelevantPR = files.data.some(file =>
- relevantPaths.some(path => file.filename.startsWith(path))
- );
-
- if (!isRelevantPR) {
- console.log('PR does not touch relevant paths. Exiting workflow.');
- return;
- }
 
  // Get parsed data
  try {
@@ -117,45 +94,6 @@ jobs:
  text: `Approvers: ${Array.from(approvers).join(', ')}\nRequired Approvers: ${requiredApprovers.join(', ')}`
  };
 
- // Get PR details
- const pr = await github.rest.pulls.get({
- owner,
- repo,
- pull_number
- });
-
- // Create or update check run
- const checkRuns = await github.rest.checks.listForRef({
- owner,
- repo,
- ref: pr.data.head.sha,
- check_name: checkName
- });
-
- // Reuse the same workflow everytime there's a new review submitted
- // instead of creating new workflows. Better efficiency and readability
- // as the number of workflows is kept to a minimal number
- if (checkRuns.data.total_count > 0) {
- await github.rest.checks.update({
- owner,
- repo,
- check_run_id: checkRuns.data.check_runs[0].id,
- status: 'completed',
- conclusion,
- output
- });
- } else {
- await github.rest.checks.create({
- owner,
- repo,
- name: checkName,
- head_sha: pr.data.head.sha,
- status: 'completed',
- conclusion,
- output
- });
- }
-
  if (conclusion === 'failure') {
  core.setFailed(`PR needs at least ${requiredApprovals} total approvals and 2 required approvals. Current approvals: ${approvers.size}, Required approvals: ${requiredApprovals}`);
  }

.github/workflows/rustc.yml

@@ -11,6 +11,7 @@ on:
  - 'library/**'
  - 'rust-toolchain.toml'
  - '.github/workflows/rustc.yml'
+ - 'scripts/check_rustc.sh'
 
 defaults:
  run:
@@ -29,35 +30,5 @@ jobs:
  with:
  path: head
 
- - name: Checkout `upstream/master`
- uses: actions/checkout@v4
- with:
- repository: rust-lang/rust
- path: upstream
- fetch-depth: 0
- submodules: true
-
- # Run rustc twice in case the toolchain needs to be installed.
- # Retrieve the commit id from the `rustc --version`. Output looks like:
- # `rustc 1.80.0-nightly (84b40fc90 2024-05-27)`
- - name: Checkout matching commit
- run: |
- cd head
- rustc --version
- COMMIT_ID=$(rustc --version | sed -e "s/.*(\(.*\) .*/\1/")
- cd ../upstream
- git checkout ${COMMIT_ID}
-
- - name: Copy Library
- run: |
- rm -rf upstream/library
- cp -r head/library upstream
-
- - name: Run tests
- working-directory: upstream
- env:
- # Avoid error due to unexpected `cfg`.
- RUSTFLAGS: "--check-cfg cfg(kani) --check-cfg cfg(feature,values(any()))"
- run: |
- ./configure --set=llvm.download-ci-llvm=true
- ./x test --stage 0 library/std
+ - name: Run rustc script
+ run: bash ./head/scripts/check_rustc.sh ${{github.workspace}}/head

README.md

@@ -7,7 +7,8 @@
 This repository is a fork of the official Rust programming
 language repository, created solely to verify the Rust standard
 library. It should not be used as an alternative to the official
-Rust releases.
+Rust releases. The repository is tool agnostic and welcomes the addition of 
+new tools.
 
 The goal is to have a verified [Rust standard library](https://doc.rust-lang.org/std/) and prove that it is safe.
 1. Contributing to the core mechanism of verifying the rust standard library
@@ -36,12 +37,14 @@ See [SECURITY](https://github.com/model-checking/kani/security/policy) for more
 ## License
 
 ### Kani
-
 Kani is distributed under the terms of both the MIT license and the Apache License (Version 2.0).
 See [LICENSE-APACHE](https://github.com/model-checking/kani/blob/main/LICENSE-APACHE) and [LICENSE-MIT](https://github.com/model-checking/kani/blob/main/LICENSE-MIT) for details.
 
 ## Rust
-
 Rust is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0), with portions covered by various BSD-like licenses.
 
 See [the Rust repository](https://github.com/rust-lang/rust) for details.
+
+## Introducing a New Tool
+
+Please use the [template available in this repository](.github/TOOL_REQUEST_TEMPLATE.md) to introduce a new verification tool.

doc/book.toml

@@ -12,6 +12,7 @@ build-dir = "../book"
 site-url = "/verify-rust-std/"
 git-repository-url = "https://github.com/model-checking/verify-rust-std"
 edit-url-template = "https://github.com/model-checking/verify-rust-std/edit/main/doc/{path}"
+no-section-label = true
 
 [output.html.playground]
 runnable = false

doc/src/SUMMARY.md

@@ -13,8 +13,16 @@
 ---
 
 - [Challenges](./challenges.md)
- - [Core Transmutation](./challenges/0001-core-transmutation.md)
- - [Memory safety of core intrinsics](./challenges/0002-intrinsics-memory.md)
- - [Pointer Arithmetic](./challenges/0003-pointer-arithmentic.md)
- - [Memory safety of BTreeMap's `btree::node` module](./challenges/0004-btree-node.md)
- - [Inductive data type](./challenges/0005-linked-list.md)
+ - [1: Verify core transmuting methods](./challenges/0001-core-transmutation.md)
+ - [2: Verify the memory safery of core intrinsics using raw pointers](./challenges/0002-intrinsics-memory.md)
+ - [3: Verifying Raw Pointer Arithmetic Operations](./challenges/0003-pointer-arithmentic.md)
+ - [4: Memory safety of BTreeMap's `btree::node` module](./challenges/0004-btree-node.md)
+ - [5: Verify functions iterating over inductive data type: `linked_list`](./challenges/0005-linked-list.md)
+ - [6: Safety of `NonNull`](./challenges/0006-nonnull.md)
+ - [8: Contracts for SmallSort](./challenges/0008-smallsort.md)
+ - [9: Safe abstractions for `core::time::Duration`](./challenges/0009-duration.md)
+ - [10: Memory safety of String](./challenges/0010-string.md)
+ - [11: Safety of Methods for Numeric Primitive Types](./challenges/0011-floats-ints.md)
+ - [12: Safety of `NonZero`](./challenges/0012-nonzero.md)
+
+

doc/src/challenges/0001-core-transmutation.md

@@ -1,7 +1,7 @@
 # Challenge 1: Verify `core` transmuting methods
 
 - **Status:** Open
-- **Tracking Issue:** [Link to issue](https://github.com/model-checking/verify-rust-std/issues/19)
+- **Tracking Issue:** [#19](https://github.com/model-checking/verify-rust-std/issues/19)
 - **Start date:** 2024-06-12
 - **End date:** 2024-12-10
 

doc/src/challenges/0002-intrinsics-memory.md

@@ -1,7 +1,7 @@
 # Challenge 2: Verify the memory safery of core intrinsics using raw pointers
 
 - **Status:** Open
-- **Tracking Issue:** [Link to issue](https://github.com/model-checking/verify-rust-std/issues/16)
+- **Tracking Issue:** [#16](https://github.com/model-checking/verify-rust-std/issues/16)
 - **Start date:** *24/06/12*
 - **End date:** *24/12/10*
 

doc/src/challenges/0003-pointer-arithmentic.md

@@ -2,7 +2,7 @@
 
 - **Status:** Open
 - **Solution:**
-- **Tracking Issue:** <https://github.com/model-checking/verify-rust-std/issues/21>
+- **Tracking Issue:** [#76](https://github.com/model-checking/verify-rust-std/issues/76)
 - **Start date:** 24/06/24
 - **End date:** 24/12/10
 

doc/src/challenges/0004-btree-node.md

@@ -1,7 +1,7 @@
 # Challenge 4: Memory safety of BTreeMap's `btree::node` module
 
 - **Status:** Open
-- **Tracking Issue:** [Link to issue](https://github.com/model-checking/verify-rust-std/issues/25)
+- **Tracking Issue:** [#77](https://github.com/model-checking/verify-rust-std/issues/77)
 - **Start date:** *2024-07-01*
 - **End date:** *2024-12-10*
 

doc/src/challenges/0005-linked-list.md

@@ -1,7 +1,7 @@
 # Challenge 5: Verify functions iterating over inductive data type: `linked_list`
 
 - **Status:** Open
-- **Tracking Issue:** [Link to issue](https://github.com/model-checking/verify-rust-std/issues/29)
+- **Tracking Issue:** [#29](https://github.com/model-checking/verify-rust-std/issues/29)
 - **Start date:** *24/07/01*
 - **End date:** *24/12/10*