Stabilize feature(more_qualified_paths)

[WaffleLapkin]

Stabilization report pending.
Tracking issue: #86935

[rustbot]

r? @fee1-dead

rustbot has assigned @fee1-dead.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[fee1-dead]

Diff looks fine

[bors]

☔ The latest upstream changes (presumably #143036) made this pull request unmergeable. Please resolve the merge conflicts.

[WaffleLapkin]

@rustbot blocked

While trying to implement this feature in r-a I found a bunch of edge cases which I haven't considered before. This is blocked until we implement it in r-a (technically not required but IMO nice) and add more tests for all the edge cases (or verify there are existing ones).

[theemathas]

According to #86935 (comment), this has now been implemented in rust-analyzer.

[rustbot]

The parser was modified, potentially altering the grammar of (stable) Rust
which would be a breaking change.

cc @fmease

[rustbot]

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

[rust-log-analyzer]

The job test-tidy failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

tmpfs           1.6G   12K  1.6G   1% /run/user/1001

biggest files in the working dir:
3627188 .
438388 ./.jjconflict-side-0
438384 ./.jjconflict-side-1
438384 ./.jjconflict-base-0
438380 ./.jjconflict-side-3
438380 ./.jjconflict-side-2
438380 ./.jjconflict-base-2
438380 ./.jjconflict-base-1
210284 ./tests
210176 ./.jjconflict-side-1/tests
210176 ./.jjconflict-side-0/tests
210176 ./.jjconflict-base-0/tests
210172 ./.jjconflict-side-3/tests
210172 ./.jjconflict-side-2/tests
210172 ./.jjconflict-base-2/tests
210172 ./.jjconflict-base-1/tests
168904 ./tests/ui
168892 ./.jjconflict-side-1/tests/ui
168892 ./.jjconflict-side-0/tests/ui
168892 ./.jjconflict-base-0/tests/ui
168888 ./.jjconflict-side-3/tests/ui
168888 ./.jjconflict-side-2/tests/ui
168888 ./.jjconflict-base-2/tests/ui
168888 ./.jjconflict-base-1/tests/ui
120308 ./src
120308 ./.jjconflict-side-3/src
120308 ./.jjconflict-side-2/src
120308 ./.jjconflict-side-1/src
120308 ./.jjconflict-side-0/src
120308 ./.jjconflict-base-2/src
120308 ./.jjconflict-base-1/src
120308 ./.jjconflict-base-0/src
119996 ./.git
90404 ./src/tools
90404 ./.jjconflict-side-3/src/tools
90404 ./.jjconflict-side-2/src/tools
90404 ./.jjconflict-side-1/src/tools
90404 ./.jjconflict-side-0/src/tools
90404 ./.jjconflict-base-2/src/tools
90404 ./.jjconflict-base-1/src/tools
90404 ./.jjconflict-base-0/src/tools
62472 ./library
62472 ./.jjconflict-side-3/library
62472 ./.jjconflict-side-2/library
62472 ./.jjconflict-side-1/library
62472 ./.jjconflict-side-0/library
62472 ./.jjconflict-base-2/library
62472 ./.jjconflict-base-1/library
62472 ./.jjconflict-base-0/library
51460 ./.git/objects
51452 ./.git/objects/pack
43816 ./compiler
43804 ./.jjconflict-side-0/compiler
43800 ./.jjconflict-side-3/compiler
43800 ./.jjconflict-side-2/compiler
43800 ./.jjconflict-side-1/compiler
43800 ./.jjconflict-base-2/compiler
43800 ./.jjconflict-base-1/compiler
43800 ./.jjconflict-base-0/compiler
36080 ./library/stdarch
36080 ./.jjconflict-side-3/library/stdarch
36080 ./.jjconflict-side-2/library/stdarch
36080 ./.jjconflict-side-1/library/stdarch
36080 ./.jjconflict-side-0/library/stdarch
36080 ./.jjconflict-base-2/library/stdarch
36080 ./.jjconflict-base-1/library/stdarch
36080 ./.jjconflict-base-0/library/stdarch
29168 ./src/tools/clippy
29168 ./.jjconflict-side-3/src/tools/clippy
29168 ./.jjconflict-side-2/src/tools/clippy
29168 ./.jjconflict-side-1/src/tools/clippy
29168 ./.jjconflict-side-0/src/tools/clippy
29168 ./.jjconflict-base-2/src/tools/clippy
29168 ./.jjconflict-base-1/src/tools/clippy
29168 ./.jjconflict-base-0/src/tools/clippy
28968 ./src/tools/rust-analyzer
28968 ./.jjconflict-side-3/src/tools/rust-analyzer
28968 ./.jjconflict-side-2/src/tools/rust-analyzer
28968 ./.jjconflict-side-1/src/tools/rust-analyzer
28968 ./.jjconflict-side-0/src/tools/rust-analyzer
28968 ./.jjconflict-base-2/src/tools/rust-analyzer
28968 ./.jjconflict-base-1/src/tools/rust-analyzer
28968 ./.jjconflict-base-0/src/tools/rust-analyzer
25664 ./src/tools/rust-analyzer/crates
25664 ./.jjconflict-side-3/src/tools/rust-analyzer/crates
25664 ./.jjconflict-side-2/src/tools/rust-analyzer/crates
25664 ./.jjconflict-side-1/src/tools/rust-analyzer/crates
25664 ./.jjconflict-side-0/src/tools/rust-analyzer/crates
25664 ./.jjconflict-base-2/src/tools/rust-analyzer/crates
25664 ./.jjconflict-base-1/src/tools/rust-analyzer/crates
25664 ./.jjconflict-base-0/src/tools/rust-analyzer/crates
24104 ./library/stdarch/crates
24104 ./.jjconflict-side-3/library/stdarch/crates
24104 ./.jjconflict-side-2/library/stdarch/crates
24104 ./.jjconflict-side-1/library/stdarch/crates
24104 ./.jjconflict-side-0/library/stdarch/crates
24104 ./.jjconflict-base-2/library/stdarch/crates
24104 ./.jjconflict-base-1/library/stdarch/crates
24104 ./.jjconflict-base-0/library/stdarch/crates
20436 ./library/stdarch/crates/core_arch

---
1303812 ./src/llvm-project/llvm/test
724360 ./src/llvm-project/llvm/test/CodeGen
496948 ./src/llvm-project/clang
486164 ./.git
438388 ./.jjconflict-side-0
438384 ./.jjconflict-side-1
438384 ./.jjconflict-base-0
438380 ./.jjconflict-side-3
438380 ./.jjconflict-side-2
438380 ./.jjconflict-base-2
438380 ./.jjconflict-base-1
391572 ./src/llvm-project/clang/test
366168 ./.git/modules
365624 ./.git/modules/src
323740 ./src/tools
320244 ./.git/modules/src/llvm-project
311236 ./src/llvm-project/llvm/test/CodeGen/AMDGPU
298696 ./.git/modules/src/llvm-project/objects
298688 ./.git/modules/src/llvm-project/objects/pack
210284 ./tests
210176 ./.jjconflict-side-1/tests
210176 ./.jjconflict-side-0/tests
210176 ./.jjconflict-base-0/tests
210172 ./.jjconflict-side-3/tests
210172 ./.jjconflict-side-2/tests
210172 ./.jjconflict-base-2/tests
210172 ./.jjconflict-base-1/tests
181740 ./src/tools/rustc-perf
177260 ./src/llvm-project/llvm/test/MC
175972 ./src/tools/rustc-perf/collector
174412 ./src/llvm-project/llvm/test/tools
169952 ./src/llvm-project/clang/test/CodeGen
168904 ./tests/ui
168892 ./.jjconflict-side-1/tests/ui
168892 ./.jjconflict-side-0/tests/ui
168892 ./.jjconflict-base-0/tests/ui
168888 ./.jjconflict-side-3/tests/ui
168888 ./.jjconflict-side-2/tests/ui
168888 ./.jjconflict-base-2/tests/ui
168888 ./.jjconflict-base-1/tests/ui
165280 ./src/tools/rustc-perf/collector/compile-benchmarks
146000 ./src/llvm-project/llvm/lib
140524 ./src/llvm-project/llvm/test/Transforms
133192 ./src/llvm-project/llvm/test/CodeGen/X86
120308 ./.jjconflict-side-3/src
120308 ./.jjconflict-side-2/src
120308 ./.jjconflict-side-1/src
120308 ./.jjconflict-side-0/src
120308 ./.jjconflict-base-2/src
120308 ./.jjconflict-base-1/src
120308 ./.jjconflict-base-0/src
120116 ./src/llvm-project/clang/test/CodeGen/RISCV
115896 ./src/llvm-project/clang/test/CodeGen/RISCV/rvv-intrinsics-autogenerated
99744 ./src/llvm-project/llvm/test/tools/llvm-mca
99304 ./src/llvm-project/libcxx
98908 ./src/llvm-project/lldb
96168 ./src/llvm-project/mlir
90404 ./.jjconflict-side-3/src/tools
90404 ./.jjconflict-side-2/src/tools
90404 ./.jjconflict-side-1/src/tools
90404 ./.jjconflict-side-0/src/tools
90404 ./.jjconflict-base-2/src/tools
90404 ./.jjconflict-base-1/src/tools
90404 ./.jjconflict-base-0/src/tools
83404 ./src/llvm-project/llvm/test/CodeGen/RISCV
80152 ./src/llvm-project/llvm/lib/Target
74672 ./src/llvm-project/llvm/test/MC/AMDGPU
74316 ./src/llvm-project/libcxx/test
68676 ./src/llvm-project/clang/test/OpenMP
64312 ./src/llvm-project/llvm/test/CodeGen/AArch64
63988 ./src/tools/rustc-perf/collector/compile-benchmarks/stm32f4-0.15.1
63952 ./src/tools/rustc-perf/collector/compile-benchmarks/stm32f4-0.15.1/src
63348 ./src/llvm-project/libcxx/test/std
63300 ./library
62472 ./.jjconflict-side-3/library
62472 ./.jjconflict-side-2/library
62472 ./.jjconflict-side-1/library
62472 ./.jjconflict-side-0/library
62472 ./.jjconflict-base-2/library
62472 ./.jjconflict-base-1/library
62472 ./.jjconflict-base-0/library
62468 ./src/llvm-project/clang/lib
57840 ./src/llvm-project/clang/test/CodeGen/RISCV/rvv-intrinsics-autogenerated/policy
55256 ./src/llvm-project/clang-tools-extra
54348 ./src/llvm-project/compiler-rt
53908 ./src/llvm-project/llvm/test/CodeGen/RISCV/rvv
---
49988 ./src/doc
45980 ./src/llvm-project/lldb/test
44476 ./src/llvm-project/llvm/test/MC/Disassembler
43816 ./compiler
43804 ./.jjconflict-side-0/compiler
43800 ./.jjconflict-side-3/compiler

##[group]Run cd src/ci/citool
cd src/ci/citool
CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build --locked
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
fmt: checked 7327 files
tidy check
tidy [rustdoc_json (src)]: `rustdoc-json-types` modified, checking format version
tidy: Skipping binary file check, read-only filesystem
tidy [features]: /checkout/compiler/rustc_feature/src/unstable.rs:643 feature more_qualified_paths already specified with status 'accepted'
tidy [features]: FAIL
removing old virtual environment
creating virtual environment at '/checkout/obj/build/venv' using 'python3.12' and 'venv'
Requirement already satisfied: pip in ./build/venv/lib/python3.12/site-packages (24.0)
Collecting pip
  Downloading pip-26.2.1-py3-none-any.whl.metadata (4.6 kB)
---
    Uninstalling pip-24.0:
      Successfully uninstalled pip-24.0
Successfully installed pip-26.2.1
linting python files
/checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:3:8: F401 [*] `re` imported but unused
/checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:114:59: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:115:57: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:116:56: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:3:8: F401 [*] `re` imported but unused
/checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:114:59: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:115:57: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:116:56: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:3:8: F401 [*] `re` imported but unused
/checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:114:59: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:115:57: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:116:56: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:3:8: F401 [*] `re` imported but unused
/checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:114:59: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:115:57: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:116:56: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:3:8: F401 [*] `re` imported but unused
/checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:114:59: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:115:57: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:116:56: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:3:8: F401 [*] `re` imported but unused
/checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:114:59: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:115:57: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:116:56: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:3:8: F401 [*] `re` imported but unused
/checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:114:59: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:115:57: E703 [*] Statement ends with an unnecessary semicolon
/checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py:116:56: E703 [*] Statement ends with an unnecessary semicolon
Found 28 errors.
[*] 28 fixable with the `--fix` option.

python linting failed! Printing diff suggestions:
--- /checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -1,6 +1,5 @@
 import json
 import os
-import re
 import sys
 import subprocess
 
@@ -111,9 +110,9 @@
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
             out.write(f'{indent16}// {arch}\n')
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
                     out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
                 else:

--- /checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -1,6 +1,5 @@
 import json
 import os
-import re
 import sys
 import subprocess
 
@@ -111,9 +110,9 @@
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
             out.write(f'{indent16}// {arch}\n')
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
                     out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
                 else:

--- /checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -1,6 +1,5 @@
 import json
 import os
-import re
 import sys
 import subprocess
 
@@ -111,9 +110,9 @@
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
             out.write(f'{indent16}// {arch}\n')
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
                     out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
                 else:

--- /checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -1,6 +1,5 @@
 import json
 import os
-import re
 import sys
 import subprocess
 
@@ -111,9 +110,9 @@
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
             out.write(f'{indent16}// {arch}\n')
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
                     out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
                 else:

--- /checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -1,6 +1,5 @@
 import json
 import os
-import re
 import sys
 import subprocess
 
@@ -111,9 +110,9 @@
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
             out.write(f'{indent16}// {arch}\n')
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
                     out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
                 else:

--- /checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -1,6 +1,5 @@
 import json
 import os
-import re
 import sys
 import subprocess
 
@@ -111,9 +110,9 @@
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
             out.write(f'{indent16}// {arch}\n')
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
                     out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
                 else:

--- /checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -1,6 +1,5 @@
 import json
 import os
-import re
 import sys
 import subprocess
 
@@ -111,9 +110,9 @@
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
             out.write(f'{indent16}// {arch}\n')
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
                     out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
                 else:

Would fix 28 errors.
rerun with `--bless` to apply ruff suggestions: `./x.py test tidy --extra-checks=py:lint --bless`
tidy [extra_checks:python_lint]: checks with external tool 'ruff' failed
tidy [extra_checks:python_lint]: FAIL
checking python file formatting
Would reformat: /checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
Would reformat: /checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
Would reformat: /checkout/.jjconflict-base-0/src/tools/clippy/util/versions.py
Would reformat: /checkout/.jjconflict-base-0/src/tools/miri/ci/scrape-targets.py
Would reformat: /checkout/.jjconflict-base-0/src/tools/miri/test-cargo-miri/run-test.py
Would reformat: /checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
Would reformat: /checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
Would reformat: /checkout/.jjconflict-base-1/src/tools/clippy/util/versions.py
Would reformat: /checkout/.jjconflict-base-1/src/tools/miri/ci/scrape-targets.py
Would reformat: /checkout/.jjconflict-base-1/src/tools/miri/test-cargo-miri/run-test.py
Would reformat: /checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
Would reformat: /checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
Would reformat: /checkout/.jjconflict-base-2/src/tools/clippy/util/versions.py
Would reformat: /checkout/.jjconflict-base-2/src/tools/miri/ci/scrape-targets.py
Would reformat: /checkout/.jjconflict-base-2/src/tools/miri/test-cargo-miri/run-test.py
Would reformat: /checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
Would reformat: /checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
Would reformat: /checkout/.jjconflict-side-0/src/tools/clippy/util/versions.py
Would reformat: /checkout/.jjconflict-side-0/src/tools/miri/ci/scrape-targets.py
Would reformat: /checkout/.jjconflict-side-0/src/tools/miri/test-cargo-miri/run-test.py
Would reformat: /checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
Would reformat: /checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
Would reformat: /checkout/.jjconflict-side-1/src/tools/clippy/util/versions.py
Would reformat: /checkout/.jjconflict-side-1/src/tools/miri/ci/scrape-targets.py
Would reformat: /checkout/.jjconflict-side-1/src/tools/miri/test-cargo-miri/run-test.py
Would reformat: /checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
Would reformat: /checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
Would reformat: /checkout/.jjconflict-side-2/src/tools/clippy/util/versions.py
Would reformat: /checkout/.jjconflict-side-2/src/tools/miri/ci/scrape-targets.py
Would reformat: /checkout/.jjconflict-side-2/src/tools/miri/test-cargo-miri/run-test.py
Would reformat: /checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
Would reformat: /checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
Would reformat: /checkout/.jjconflict-side-3/src/tools/clippy/util/versions.py
Would reformat: /checkout/.jjconflict-side-3/src/tools/miri/ci/scrape-targets.py
Would reformat: /checkout/.jjconflict-side-3/src/tools/miri/test-cargo-miri/run-test.py
35 files would be reformatted, 312 files already formatted

python formatting does not match! Printing diff:
--- /checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
+++ /checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
@@ -38,8 +38,10 @@
                 if line == "};":
                     # We're done!
                     if found == 0:
-                        print("No intrinsics found in manual code even though we found the "
-                            "marker... Aborting...")
+                        print(
+                            "No intrinsics found in manual code even though we found the "
+                            "marker... Aborting..."
+                        )
                         return 1
                     for error in errors:
                         print("ERROR => {}".format(error))
@@ -50,12 +52,17 @@
                 found += 1
                 if parts[1] in intrinsics_map:
                     if parts[3] != intrinsics_map[parts[1]]:
-                        print("Same intrinsics (`{}` at line {}) but different GCC "
+                        print(
+                            "Same intrinsics (`{}` at line {}) but different GCC "
                             "translations: `{}` != `{}`".format(
-                                parts[1], pos, intrinsics_map[parts[1]], parts[3]))
+                                parts[1], pos, intrinsics_map[parts[1]], parts[3]
+                            )
+                        )
                     else:
-                        errors.append("Duplicated intrinsics: `{}` at line {}. Please remove it "
-                            " from manual code".format(parts[1], pos))
+                        errors.append(
+                            "Duplicated intrinsics: `{}` at line {}. Please remove it "
+                            " from manual code".format(parts[1], pos)
+                        )
             # Weird but whatever...
             return 1 if len(errors) != 0 else 0
         pos += 1

--- /checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-base-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -15,7 +15,11 @@
 def clone_repository(repo_name, path, repo_url, sub_paths):
     if os.path.exists(path):
         while True:
-            choice = input("There is already a `{}` folder, do you want to update it? [y/N]".format(path))
+            choice = input(
+                "There is already a `{}` folder, do you want to update it? [y/N]".format(
+                    path
+                )
+            )
             if choice == "" or choice.lower() == "n":
                 print("Skipping repository update.")
                 return
@@ -37,8 +41,8 @@
 
 
 def convert_to_string(content):
-    if content.__class__.__name__ == 'bytes':
-        return content.decode('utf-8')
+    if content.__class__.__name__ == "bytes":
+        return content.decode("utf-8")
     return content
 
 
@@ -109,17 +113,23 @@
 {indent8}{attribute} fn {arch}(name: &str,full_name:&str) -> &'static str {{
 {indent12}match name {{""")
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
-            out.write(f'{indent16}// {arch}\n')
+            out.write(f"{indent16}// {arch}\n")
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
-                    out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
+                    out.write(
+                        f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n'
+                    )
                 else:
                     out.write(f'{indent16}"{llvm_name}" => "{entry[1]}",\n')
-            out.write(f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n')
-            out.write(f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,")
+            out.write(
+                f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n'
+            )
+            out.write(
+                f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,"
+            )
         out.write(f"""{indent4}_ => {{
 {indent8}match old_arch_res {{
 {indent8}ArchCheckResult::UnknownIntrinsic => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),
@@ -146,6 +156,7 @@
     )
     update_intrinsics(llvm_path)
 
+
 # llvm-tblgen can be built with:
 #
 # mkdir llvm-tblgen-build && cd llvm-tblgen-build

--- /checkout/.jjconflict-base-0/src/tools/clippy/util/versions.py
+++ /checkout/.jjconflict-base-0/src/tools/clippy/util/versions.py
@@ -5,9 +5,10 @@
 import os
 import sys
 
+
 def key(v):
     if v == "stable":
-        return sys.maxsize 
+        return sys.maxsize
     if v == "beta":
         return sys.maxsize - 1
---
 
+
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("input", help="path to the versions.html template", type=argparse.FileType("r"))
+    parser.add_argument(
+        "input", help="path to the versions.html template", type=argparse.FileType("r")
+    )
     parser.add_argument("outdir", help="path to write the output HTML")
     args = parser.parse_args()
 
-    versions = [
-        dir
-        for dir in os.listdir(args.outdir)
-        if key(dir) is not None
+    versions = [dir for dir in os.listdir(args.outdir) if key(dir) is not None]
+    versions.sort(key=key, reverse=True)
+    links = [
+        f'<a class="list-group-item" href="./{version}/index.html">{version}</a>'
+        for version in versions
     ]
-    versions.sort(key=key, reverse=True)
-    links = [f'<a class="list-group-item" href="./{version}/index.html">{version}</a>' for version in versions]
 
     template = Template(args.input.read())
     html = template.substitute(list="\n".join(links))
@@ -47,5 +50,6 @@
         out.write(html)
         print(f"wrote HTML to {path}")
 
+
 if __name__ == "__main__":
     main()

--- /checkout/.jjconflict-base-0/src/tools/miri/ci/scrape-targets.py
+++ /checkout/.jjconflict-base-0/src/tools/miri/ci/scrape-targets.py
@@ -1,7 +1,7 @@
 import sys
 from bs4 import BeautifulSoup
 
-html = open(sys.argv[1], 'r').read()
+html = open(sys.argv[1], "r").read()
 soup = BeautifulSoup(html, features="html.parser")
 # The tables are:
 # Tier 1                    <-- this is already checked by main CI, so we ignore it here
@@ -9,7 +9,7 @@
 # Tier 2 without host tools <-- and also this
 # Tier 3
 for table in soup.find_all("table")[1:3]:
-    for row in table.find_all('tr'):
-        code = row.find('code')
+    for row in table.find_all("tr"):
+        code = row.find("code")
         if code is not None:
             print(code.text)

--- /checkout/.jjconflict-base-0/src/tools/miri/test-cargo-miri/run-test.py
+++ /checkout/.jjconflict-base-0/src/tools/miri/test-cargo-miri/run-test.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-'''
+"""
 Test whether cargo-miri works properly.
---
@@ -12,17 +12,19 @@
 import sys
 import argparse
 
-CGREEN  = '\33[32m'
-CBOLD   = '\33[1m'
-CEND    = '\33[0m'
+CGREEN = "\33[32m"
+CBOLD = "\33[1m"
+CEND = "\33[0m"
 
 CARGO_EXTRA_FLAGS = os.environ.get("CARGO_EXTRA_FLAGS", "").split()
 
+
 def fail(msg):
     print("\nTEST FAIL: {}".format(msg))
     sys.exit(1)
 
-def cargo_miri(cmd, quiet = True, targets = None):
+
+def cargo_miri(cmd, quiet=True, targets=None):
     args = ["cargo", "miri", cmd] + CARGO_EXTRA_FLAGS
     if quiet:
         args += ["-q"]
@@ -35,15 +37,19 @@
 
     return args
 
+
 def normalize_stdout(str):
-    str = str.replace("src\\", "src/") # normalize paths across platforms
-    str = re.sub("\\b\\d+\\.\\d+s\\b", "$TIME", str) # the time keeps changing, obviously
+    str = str.replace("src\\", "src/")  # normalize paths across platforms
+    str = re.sub(
+        "\\b\\d+\\.\\d+s\\b", "$TIME", str
+    )  # the time keeps changing, obviously
     return str
 
+
 def check_output(actual, path, name):
     if ARGS.bless:
         # Write the output only if bless is set
-        open(path, mode='w').write(actual)
+        open(path, mode="w").write(actual)
         return True
     expected = open(path).read()
     if expected == actual:
@@ -56,7 +62,8 @@
     print(f"--- END diff {name} ---")
     return False
 
-def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
+
+def test(name, cmd, stdout_ref, stderr_ref, stdin=b"", env=None):
     if env is None:
         env = {}
     print("Testing {}...".format(name))
@@ -82,6 +89,7 @@
         return
     fail("exit code was {}".format(p.returncode))
 
+
 def test_no_rebuild(name, cmd, env=None):
     if env is None:
         env = {}
@@ -106,113 +114,174 @@
         print("--- END stderr ---")
         fail("Something was being rebuilt when it should not be (or we got no output)")
 
+
 def test_cargo_miri_run():
-    test("`cargo miri run` (no isolation)",
+    test(
+        "`cargo miri run` (no isolation)",
         cargo_miri("run"),
-        "run.default.stdout.ref", "run.default.stderr.ref",
-        stdin=b'12\n21\n',
+        "run.default.stdout.ref",
+        "run.default.stderr.ref",
+        stdin=b"12\n21\n",
         env={
-            'MIRIFLAGS': "-Zmiri-disable-isolation",
-            'MIRITESTVAR': "wrongval", # make sure the build.rs value takes precedence
+            "MIRIFLAGS": "-Zmiri-disable-isolation",
+            "MIRITESTVAR": "wrongval",  # make sure the build.rs value takes precedence
         },
     )
     # Special test: run it again *without* `-q` to make sure nothing is being rebuilt (Miri issue #1722)
-    test_no_rebuild("`cargo miri run` (no rebuild)",
+    test_no_rebuild(
+        "`cargo miri run` (no rebuild)",
         cargo_miri("run", quiet=False) + ["--", ""],
-        env={'MIRITESTVAR': "wrongval"}, # changing the env var causes a rebuild (re-runs build.rs),
-                                         # so keep it set
+        env={
+            "MIRITESTVAR": "wrongval"
+        },  # changing the env var causes a rebuild (re-runs build.rs),
+        # so keep it set
     )
     # This also covers passing arguments without `--`: Cargo will forward unused positional arguments to the program.
-    test("`cargo miri run` (with arguments and target)",
-        cargo_miri("run") + ["--bin", "cargo-miri-test", "hello world", '"hello world"', r'he\\llo\"world'],
-        "run.args.stdout.ref", "run.args.stderr.ref",
+    test(
+        "`cargo miri run` (with arguments and target)",
+        cargo_miri("run")
+        + [
+            "--bin",
+            "cargo-miri-test",
+            "hello world",
+            '"hello world"',
+            r"he\\llo\"world",
+        ],
+        "run.args.stdout.ref",
+        "run.args.stderr.ref",
     )
-    test("`cargo miri r` (subcrate, no isolation)",
+    test(
+        "`cargo miri r` (subcrate, no isolation)",
         cargo_miri("r") + ["-p", "subcrate"],
-        "run.subcrate.stdout.ref", "run.subcrate.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "run.subcrate.stdout.ref",
+        "run.subcrate.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri run` (custom target dir)",
+    test(
+        "`cargo miri run` (custom target dir)",
         # Attempt to confuse the argument parser.
-        cargo_miri("run") + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
-        "run.args.stdout.ref", "run.custom-target-dir.stderr.ref",
+        cargo_miri("run")
+        + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
+        "run.args.stdout.ref",
+        "run.custom-target-dir.stderr.ref",
     )
-    test("`cargo miri run` (test local crate detection)",
-         cargo_miri("run") + ["--package=test-local-crate-detection"],
-         "run.local_crate.stdout.ref", "run.local_crate.stderr.ref",
+    test(
+        "`cargo miri run` (test local crate detection)",
+        cargo_miri("run") + ["--package=test-local-crate-detection"],
+        "run.local_crate.stdout.ref",
+        "run.local_crate.stderr.ref",
     )
 
+
 def test_cargo_miri_test():
-    test("`cargo miri test`",
+    test(
+        "`cargo miri test`",
         cargo_miri("test"),
-        "test.default.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-seed=4242"},
+        "test.default.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-seed=4242"},
     )
-    test("`cargo miri test` (no isolation, no doctests)",
-        cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
-        "test.no-doc.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    test(
+        "`cargo miri test` (no isolation, no doctests)",
+        cargo_miri("test")
+        + ["--bins", "--tests"],  # no `--lib`, we disabled that in `Cargo.toml`
+        "test.no-doc.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (with filter)",
+    test(
+        "`cargo miri test` (with filter)",
         cargo_miri("test") + ["--", "--format=pretty", "pl"],
-        "test.filter.stdout.ref", "test.empty.ref",
+        "test.filter.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (test target)",
+    test(
+        "`cargo miri test` (test target)",
         cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
-        "test.test-target.stdout.ref", "test.empty.ref",
+        "test.test-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (bin target)",
+    test(
+        "`cargo miri test` (bin target)",
         cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
-        "test.bin-target.stdout.ref", "test.empty.ref",
+        "test.bin-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri t` (subcrate, no isolation)",
+    test(
+        "`cargo miri t` (subcrate, no isolation)",
         cargo_miri("t") + ["-p", "subcrate"],
         "test.subcrate.stdout.ref",
         "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (entire workspace, no isolation)",
+    test(
+        "`cargo miri test` (entire workspace, no isolation)",
         cargo_miri("test") + ["--workspace"],
-        "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "test.workspace.stdout.ref",
+        "test.workspace.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
     # FIXME: test is disabled for cross-compiled targets because it fails to link.
     # Related to <https://github.com/rust-lang/cargo/issues/17200>.
-    if not os.environ.get('MIRI_TESTS_CROSS_COMPILED'):
-        test("`cargo miri test` (entire workspace, no isolation, host-config)",
-            cargo_miri("test") + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
-            "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-            env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    if not os.environ.get("MIRI_TESTS_CROSS_COMPILED"):
+        test(
+            "`cargo miri test` (entire workspace, no isolation, host-config)",
+            cargo_miri("test")
+            + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
+            "test.workspace.stdout.ref",
+            "test.workspace.stderr.ref",
+            env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
         )
-    test("`cargo miri test` (custom target dir)",
+    test(
+        "`cargo miri test` (custom target dir)",
         cargo_miri("test") + ["--target-dir=custom-test"],
-        "test.default.stdout.ref", "test.empty.ref",
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
-    del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
-    test("`cargo miri test` (config-cli)",
-        cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
-        "test.default.stdout.ref", "test.empty.ref",
+    del os.environ[
+        "CARGO_TARGET_DIR"
+    ]  # this overrides `build.target-dir` passed by `--config`, so unset it
+    test(
+        "`cargo miri test` (config-cli)",
+        cargo_miri("test") + ['--config=build.target-dir="config-cli"'],
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
     if ARGS.multi_target:
         test_cargo_miri_multi_target()
 
 
 def test_cargo_miri_multi_target():
-    test("`cargo miri test` (multiple targets)",
-        cargo_miri("test", targets = ["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]),
-        "test.multiple_targets.stdout.ref", "test.empty.ref",
+    test(
+        "`cargo miri test` (multiple targets)",
+        cargo_miri(
+            "test", targets=["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]
+        ),
+        "test.multiple_targets.stdout.ref",
+        "test.empty.ref",
     )
 
-args_parser = argparse.ArgumentParser(description='`cargo miri` testing')
-args_parser.add_argument('--target', help='the target to test')
-args_parser.add_argument('--bless', help='bless the reference files', action='store_true')
-args_parser.add_argument('--multi-target', help='run tests related to multiple targets', action='store_true')
+
+args_parser = argparse.ArgumentParser(description="`cargo miri` testing")
+args_parser.add_argument("--target", help="the target to test")
+args_parser.add_argument(
+    "--bless", help="bless the reference files", action="store_true"
+)
+args_parser.add_argument(
+    "--multi-target", help="run tests related to multiple targets", action="store_true"
+)
 ARGS = args_parser.parse_args()
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
-os.environ["CARGO_TARGET_DIR"] = "target" # this affects the location of the target directory that we need to check
-os.environ["RUST_TEST_NOCAPTURE"] = "0" # this affects test output, so make sure it is not set
-os.environ["RUST_TEST_THREADS"] = "1" # avoid non-deterministic output due to concurrent test runs
+os.environ["CARGO_TARGET_DIR"] = (
+    "target"  # this affects the location of the target directory that we need to check
+)
+os.environ["RUST_TEST_NOCAPTURE"] = (
+    "0"  # this affects test output, so make sure it is not set
+)
+os.environ["RUST_TEST_THREADS"] = (
+    "1"  # avoid non-deterministic output due to concurrent test runs
+)
 
 target_str = " for target {}".format(ARGS.target) if ARGS.target else ""
 print(CGREEN + CBOLD + "## Running `cargo miri` tests{}".format(target_str) + CEND)

--- /checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
+++ /checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
@@ -38,8 +38,10 @@
                 if line == "};":
                     # We're done!
                     if found == 0:
-                        print("No intrinsics found in manual code even though we found the "
-                            "marker... Aborting...")
+                        print(
+                            "No intrinsics found in manual code even though we found the "
+                            "marker... Aborting..."
+                        )
                         return 1
                     for error in errors:
                         print("ERROR => {}".format(error))
@@ -50,12 +52,17 @@
                 found += 1
                 if parts[1] in intrinsics_map:
                     if parts[3] != intrinsics_map[parts[1]]:
-                        print("Same intrinsics (`{}` at line {}) but different GCC "
+                        print(
+                            "Same intrinsics (`{}` at line {}) but different GCC "
                             "translations: `{}` != `{}`".format(
-                                parts[1], pos, intrinsics_map[parts[1]], parts[3]))
+                                parts[1], pos, intrinsics_map[parts[1]], parts[3]
+                            )
+                        )
                     else:
-                        errors.append("Duplicated intrinsics: `{}` at line {}. Please remove it "
-                            " from manual code".format(parts[1], pos))
+                        errors.append(
+                            "Duplicated intrinsics: `{}` at line {}. Please remove it "
+                            " from manual code".format(parts[1], pos)
+                        )
             # Weird but whatever...
             return 1 if len(errors) != 0 else 0
         pos += 1

--- /checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-base-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -15,7 +15,11 @@
 def clone_repository(repo_name, path, repo_url, sub_paths):
     if os.path.exists(path):
         while True:
-            choice = input("There is already a `{}` folder, do you want to update it? [y/N]".format(path))
+            choice = input(
+                "There is already a `{}` folder, do you want to update it? [y/N]".format(
+                    path
+                )
+            )
             if choice == "" or choice.lower() == "n":
                 print("Skipping repository update.")
                 return
@@ -37,8 +41,8 @@
 
 
 def convert_to_string(content):
-    if content.__class__.__name__ == 'bytes':
-        return content.decode('utf-8')
+    if content.__class__.__name__ == "bytes":
+        return content.decode("utf-8")
     return content
 
 
@@ -109,17 +113,23 @@
 {indent8}{attribute} fn {arch}(name: &str,full_name:&str) -> &'static str {{
 {indent12}match name {{""")
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
-            out.write(f'{indent16}// {arch}\n')
+            out.write(f"{indent16}// {arch}\n")
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
-                    out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
+                    out.write(
+                        f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n'
+                    )
                 else:
                     out.write(f'{indent16}"{llvm_name}" => "{entry[1]}",\n')
-            out.write(f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n')
-            out.write(f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,")
+            out.write(
+                f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n'
+            )
+            out.write(
+                f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,"
+            )
         out.write(f"""{indent4}_ => {{
 {indent8}match old_arch_res {{
 {indent8}ArchCheckResult::UnknownIntrinsic => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),
@@ -146,6 +156,7 @@
     )
     update_intrinsics(llvm_path)
 
+
 # llvm-tblgen can be built with:
 #
 # mkdir llvm-tblgen-build && cd llvm-tblgen-build

--- /checkout/.jjconflict-base-1/src/tools/clippy/util/versions.py
+++ /checkout/.jjconflict-base-1/src/tools/clippy/util/versions.py
@@ -5,9 +5,10 @@
 import os
 import sys
 
+
 def key(v):
     if v == "stable":
-        return sys.maxsize 
+        return sys.maxsize
     if v == "beta":
         return sys.maxsize - 1
---
 
+
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("input", help="path to the versions.html template", type=argparse.FileType("r"))
+    parser.add_argument(
+        "input", help="path to the versions.html template", type=argparse.FileType("r")
+    )
     parser.add_argument("outdir", help="path to write the output HTML")
     args = parser.parse_args()
 
-    versions = [
-        dir
-        for dir in os.listdir(args.outdir)
-        if key(dir) is not None
+    versions = [dir for dir in os.listdir(args.outdir) if key(dir) is not None]
+    versions.sort(key=key, reverse=True)
+    links = [
+        f'<a class="list-group-item" href="./{version}/index.html">{version}</a>'
+        for version in versions
     ]
-    versions.sort(key=key, reverse=True)
-    links = [f'<a class="list-group-item" href="./{version}/index.html">{version}</a>' for version in versions]
 
     template = Template(args.input.read())
     html = template.substitute(list="\n".join(links))
@@ -47,5 +50,6 @@
         out.write(html)
         print(f"wrote HTML to {path}")
 
+
 if __name__ == "__main__":
     main()

--- /checkout/.jjconflict-base-1/src/tools/miri/ci/scrape-targets.py
+++ /checkout/.jjconflict-base-1/src/tools/miri/ci/scrape-targets.py
@@ -1,7 +1,7 @@
 import sys
 from bs4 import BeautifulSoup
 
-html = open(sys.argv[1], 'r').read()
+html = open(sys.argv[1], "r").read()
 soup = BeautifulSoup(html, features="html.parser")
 # The tables are:
 # Tier 1                    <-- this is already checked by main CI, so we ignore it here
@@ -9,7 +9,7 @@
 # Tier 2 without host tools <-- and also this
 # Tier 3
 for table in soup.find_all("table")[1:3]:
-    for row in table.find_all('tr'):
-        code = row.find('code')
+    for row in table.find_all("tr"):
+        code = row.find("code")
         if code is not None:
             print(code.text)

--- /checkout/.jjconflict-base-1/src/tools/miri/test-cargo-miri/run-test.py
+++ /checkout/.jjconflict-base-1/src/tools/miri/test-cargo-miri/run-test.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-'''
+"""
 Test whether cargo-miri works properly.
---
@@ -12,17 +12,19 @@
 import sys
 import argparse
 
-CGREEN  = '\33[32m'
-CBOLD   = '\33[1m'
-CEND    = '\33[0m'
+CGREEN = "\33[32m"
+CBOLD = "\33[1m"
+CEND = "\33[0m"
 
 CARGO_EXTRA_FLAGS = os.environ.get("CARGO_EXTRA_FLAGS", "").split()
 
+
 def fail(msg):
     print("\nTEST FAIL: {}".format(msg))
     sys.exit(1)
 
-def cargo_miri(cmd, quiet = True, targets = None):
+
+def cargo_miri(cmd, quiet=True, targets=None):
     args = ["cargo", "miri", cmd] + CARGO_EXTRA_FLAGS
     if quiet:
         args += ["-q"]
@@ -35,15 +37,19 @@
 
     return args
 
+
 def normalize_stdout(str):
-    str = str.replace("src\\", "src/") # normalize paths across platforms
-    str = re.sub("\\b\\d+\\.\\d+s\\b", "$TIME", str) # the time keeps changing, obviously
+    str = str.replace("src\\", "src/")  # normalize paths across platforms
+    str = re.sub(
+        "\\b\\d+\\.\\d+s\\b", "$TIME", str
+    )  # the time keeps changing, obviously
     return str
 
+
 def check_output(actual, path, name):
     if ARGS.bless:
         # Write the output only if bless is set
-        open(path, mode='w').write(actual)
+        open(path, mode="w").write(actual)
         return True
     expected = open(path).read()
     if expected == actual:
@@ -56,7 +62,8 @@
     print(f"--- END diff {name} ---")
     return False
 
-def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
+
+def test(name, cmd, stdout_ref, stderr_ref, stdin=b"", env=None):
     if env is None:
         env = {}
     print("Testing {}...".format(name))
@@ -82,6 +89,7 @@
         return
     fail("exit code was {}".format(p.returncode))
 
+
 def test_no_rebuild(name, cmd, env=None):
     if env is None:
         env = {}
@@ -106,113 +114,174 @@
         print("--- END stderr ---")
         fail("Something was being rebuilt when it should not be (or we got no output)")
 
+
 def test_cargo_miri_run():
-    test("`cargo miri run` (no isolation)",
+    test(
+        "`cargo miri run` (no isolation)",
         cargo_miri("run"),
-        "run.default.stdout.ref", "run.default.stderr.ref",
-        stdin=b'12\n21\n',
+        "run.default.stdout.ref",
+        "run.default.stderr.ref",
+        stdin=b"12\n21\n",
         env={
-            'MIRIFLAGS': "-Zmiri-disable-isolation",
-            'MIRITESTVAR': "wrongval", # make sure the build.rs value takes precedence
+            "MIRIFLAGS": "-Zmiri-disable-isolation",
+            "MIRITESTVAR": "wrongval",  # make sure the build.rs value takes precedence
         },
     )
     # Special test: run it again *without* `-q` to make sure nothing is being rebuilt (Miri issue #1722)
-    test_no_rebuild("`cargo miri run` (no rebuild)",
+    test_no_rebuild(
+        "`cargo miri run` (no rebuild)",
         cargo_miri("run", quiet=False) + ["--", ""],
-        env={'MIRITESTVAR': "wrongval"}, # changing the env var causes a rebuild (re-runs build.rs),
-                                         # so keep it set
+        env={
+            "MIRITESTVAR": "wrongval"
+        },  # changing the env var causes a rebuild (re-runs build.rs),
+        # so keep it set
     )
     # This also covers passing arguments without `--`: Cargo will forward unused positional arguments to the program.
-    test("`cargo miri run` (with arguments and target)",
-        cargo_miri("run") + ["--bin", "cargo-miri-test", "hello world", '"hello world"', r'he\\llo\"world'],
-        "run.args.stdout.ref", "run.args.stderr.ref",
+    test(
+        "`cargo miri run` (with arguments and target)",
+        cargo_miri("run")
+        + [
+            "--bin",
+            "cargo-miri-test",
+            "hello world",
+            '"hello world"',
+            r"he\\llo\"world",
+        ],
+        "run.args.stdout.ref",
+        "run.args.stderr.ref",
     )
-    test("`cargo miri r` (subcrate, no isolation)",
+    test(
+        "`cargo miri r` (subcrate, no isolation)",
         cargo_miri("r") + ["-p", "subcrate"],
-        "run.subcrate.stdout.ref", "run.subcrate.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "run.subcrate.stdout.ref",
+        "run.subcrate.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri run` (custom target dir)",
+    test(
+        "`cargo miri run` (custom target dir)",
         # Attempt to confuse the argument parser.
-        cargo_miri("run") + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
-        "run.args.stdout.ref", "run.custom-target-dir.stderr.ref",
+        cargo_miri("run")
+        + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
+        "run.args.stdout.ref",
+        "run.custom-target-dir.stderr.ref",
     )
-    test("`cargo miri run` (test local crate detection)",
-         cargo_miri("run") + ["--package=test-local-crate-detection"],
-         "run.local_crate.stdout.ref", "run.local_crate.stderr.ref",
+    test(
+        "`cargo miri run` (test local crate detection)",
+        cargo_miri("run") + ["--package=test-local-crate-detection"],
+        "run.local_crate.stdout.ref",
+        "run.local_crate.stderr.ref",
     )
 
+
 def test_cargo_miri_test():
-    test("`cargo miri test`",
+    test(
+        "`cargo miri test`",
         cargo_miri("test"),
-        "test.default.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-seed=4242"},
+        "test.default.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-seed=4242"},
     )
-    test("`cargo miri test` (no isolation, no doctests)",
-        cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
-        "test.no-doc.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    test(
+        "`cargo miri test` (no isolation, no doctests)",
+        cargo_miri("test")
+        + ["--bins", "--tests"],  # no `--lib`, we disabled that in `Cargo.toml`
+        "test.no-doc.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (with filter)",
+    test(
+        "`cargo miri test` (with filter)",
         cargo_miri("test") + ["--", "--format=pretty", "pl"],
-        "test.filter.stdout.ref", "test.empty.ref",
+        "test.filter.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (test target)",
+    test(
+        "`cargo miri test` (test target)",
         cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
-        "test.test-target.stdout.ref", "test.empty.ref",
+        "test.test-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (bin target)",
+    test(
+        "`cargo miri test` (bin target)",
         cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
-        "test.bin-target.stdout.ref", "test.empty.ref",
+        "test.bin-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri t` (subcrate, no isolation)",
+    test(
+        "`cargo miri t` (subcrate, no isolation)",
         cargo_miri("t") + ["-p", "subcrate"],
         "test.subcrate.stdout.ref",
         "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (entire workspace, no isolation)",
+    test(
+        "`cargo miri test` (entire workspace, no isolation)",
         cargo_miri("test") + ["--workspace"],
-        "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "test.workspace.stdout.ref",
+        "test.workspace.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
     # FIXME: test is disabled for cross-compiled targets because it fails to link.
     # Related to <https://github.com/rust-lang/cargo/issues/17200>.
-    if not os.environ.get('MIRI_TESTS_CROSS_COMPILED'):
-        test("`cargo miri test` (entire workspace, no isolation, host-config)",
-            cargo_miri("test") + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
-            "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-            env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    if not os.environ.get("MIRI_TESTS_CROSS_COMPILED"):
+        test(
+            "`cargo miri test` (entire workspace, no isolation, host-config)",
+            cargo_miri("test")
+            + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
+            "test.workspace.stdout.ref",
+            "test.workspace.stderr.ref",
+            env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
         )
-    test("`cargo miri test` (custom target dir)",
+    test(
+        "`cargo miri test` (custom target dir)",
         cargo_miri("test") + ["--target-dir=custom-test"],
-        "test.default.stdout.ref", "test.empty.ref",
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
-    del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
-    test("`cargo miri test` (config-cli)",
-        cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
-        "test.default.stdout.ref", "test.empty.ref",
+    del os.environ[
+        "CARGO_TARGET_DIR"
+    ]  # this overrides `build.target-dir` passed by `--config`, so unset it
+    test(
+        "`cargo miri test` (config-cli)",
+        cargo_miri("test") + ['--config=build.target-dir="config-cli"'],
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
     if ARGS.multi_target:
         test_cargo_miri_multi_target()
 
 
 def test_cargo_miri_multi_target():
-    test("`cargo miri test` (multiple targets)",
-        cargo_miri("test", targets = ["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]),
-        "test.multiple_targets.stdout.ref", "test.empty.ref",
+    test(
+        "`cargo miri test` (multiple targets)",
+        cargo_miri(
+            "test", targets=["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]
+        ),
+        "test.multiple_targets.stdout.ref",
+        "test.empty.ref",
     )
 
-args_parser = argparse.ArgumentParser(description='`cargo miri` testing')
-args_parser.add_argument('--target', help='the target to test')
-args_parser.add_argument('--bless', help='bless the reference files', action='store_true')
-args_parser.add_argument('--multi-target', help='run tests related to multiple targets', action='store_true')
+
+args_parser = argparse.ArgumentParser(description="`cargo miri` testing")
+args_parser.add_argument("--target", help="the target to test")
+args_parser.add_argument(
+    "--bless", help="bless the reference files", action="store_true"
+)
+args_parser.add_argument(
+    "--multi-target", help="run tests related to multiple targets", action="store_true"
+)
 ARGS = args_parser.parse_args()
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
-os.environ["CARGO_TARGET_DIR"] = "target" # this affects the location of the target directory that we need to check
-os.environ["RUST_TEST_NOCAPTURE"] = "0" # this affects test output, so make sure it is not set
-os.environ["RUST_TEST_THREADS"] = "1" # avoid non-deterministic output due to concurrent test runs
+os.environ["CARGO_TARGET_DIR"] = (
+    "target"  # this affects the location of the target directory that we need to check
+)
+os.environ["RUST_TEST_NOCAPTURE"] = (
+    "0"  # this affects test output, so make sure it is not set
+)
+os.environ["RUST_TEST_THREADS"] = (
+    "1"  # avoid non-deterministic output due to concurrent test runs
+)
 
 target_str = " for target {}".format(ARGS.target) if ARGS.target else ""
 print(CGREEN + CBOLD + "## Running `cargo miri` tests{}".format(target_str) + CEND)

--- /checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
+++ /checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
@@ -38,8 +38,10 @@
                 if line == "};":
                     # We're done!
                     if found == 0:
-                        print("No intrinsics found in manual code even though we found the "
-                            "marker... Aborting...")
+                        print(
+                            "No intrinsics found in manual code even though we found the "
+                            "marker... Aborting..."
+                        )
                         return 1
                     for error in errors:
                         print("ERROR => {}".format(error))
@@ -50,12 +52,17 @@
                 found += 1
                 if parts[1] in intrinsics_map:
                     if parts[3] != intrinsics_map[parts[1]]:
-                        print("Same intrinsics (`{}` at line {}) but different GCC "
+                        print(
+                            "Same intrinsics (`{}` at line {}) but different GCC "
                             "translations: `{}` != `{}`".format(
-                                parts[1], pos, intrinsics_map[parts[1]], parts[3]))
+                                parts[1], pos, intrinsics_map[parts[1]], parts[3]
+                            )
+                        )
                     else:
-                        errors.append("Duplicated intrinsics: `{}` at line {}. Please remove it "
-                            " from manual code".format(parts[1], pos))
+                        errors.append(
+                            "Duplicated intrinsics: `{}` at line {}. Please remove it "
+                            " from manual code".format(parts[1], pos)
+                        )
             # Weird but whatever...
             return 1 if len(errors) != 0 else 0
         pos += 1

--- /checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-base-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -15,7 +15,11 @@
 def clone_repository(repo_name, path, repo_url, sub_paths):
     if os.path.exists(path):
         while True:
-            choice = input("There is already a `{}` folder, do you want to update it? [y/N]".format(path))
+            choice = input(
+                "There is already a `{}` folder, do you want to update it? [y/N]".format(
+                    path
+                )
+            )
             if choice == "" or choice.lower() == "n":
                 print("Skipping repository update.")
                 return
@@ -37,8 +41,8 @@
 
 
 def convert_to_string(content):
-    if content.__class__.__name__ == 'bytes':
-        return content.decode('utf-8')
+    if content.__class__.__name__ == "bytes":
+        return content.decode("utf-8")
     return content
 
 
@@ -109,17 +113,23 @@
 {indent8}{attribute} fn {arch}(name: &str,full_name:&str) -> &'static str {{
 {indent12}match name {{""")
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
-            out.write(f'{indent16}// {arch}\n')
+            out.write(f"{indent16}// {arch}\n")
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
-                    out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
+                    out.write(
+                        f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n'
+                    )
                 else:
                     out.write(f'{indent16}"{llvm_name}" => "{entry[1]}",\n')
-            out.write(f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n')
-            out.write(f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,")
+            out.write(
+                f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n'
+            )
+            out.write(
+                f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,"
+            )
         out.write(f"""{indent4}_ => {{
 {indent8}match old_arch_res {{
 {indent8}ArchCheckResult::UnknownIntrinsic => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),
@@ -146,6 +156,7 @@
     )
     update_intrinsics(llvm_path)
 
+
 # llvm-tblgen can be built with:
 #
 # mkdir llvm-tblgen-build && cd llvm-tblgen-build

--- /checkout/.jjconflict-base-2/src/tools/clippy/util/versions.py
+++ /checkout/.jjconflict-base-2/src/tools/clippy/util/versions.py
@@ -5,9 +5,10 @@
 import os
 import sys
 
+
 def key(v):
     if v == "stable":
-        return sys.maxsize 
+        return sys.maxsize
     if v == "beta":
         return sys.maxsize - 1
---
 
+
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("input", help="path to the versions.html template", type=argparse.FileType("r"))
+    parser.add_argument(
+        "input", help="path to the versions.html template", type=argparse.FileType("r")
+    )
     parser.add_argument("outdir", help="path to write the output HTML")
     args = parser.parse_args()
 
-    versions = [
-        dir
-        for dir in os.listdir(args.outdir)
-        if key(dir) is not None
+    versions = [dir for dir in os.listdir(args.outdir) if key(dir) is not None]
+    versions.sort(key=key, reverse=True)
+    links = [
+        f'<a class="list-group-item" href="./{version}/index.html">{version}</a>'
+        for version in versions
     ]
-    versions.sort(key=key, reverse=True)
-    links = [f'<a class="list-group-item" href="./{version}/index.html">{version}</a>' for version in versions]
 
     template = Template(args.input.read())
     html = template.substitute(list="\n".join(links))
@@ -47,5 +50,6 @@
         out.write(html)
         print(f"wrote HTML to {path}")
 
+
 if __name__ == "__main__":
     main()

--- /checkout/.jjconflict-base-2/src/tools/miri/ci/scrape-targets.py
+++ /checkout/.jjconflict-base-2/src/tools/miri/ci/scrape-targets.py
@@ -1,7 +1,7 @@
 import sys
 from bs4 import BeautifulSoup
 
-html = open(sys.argv[1], 'r').read()
+html = open(sys.argv[1], "r").read()
 soup = BeautifulSoup(html, features="html.parser")
 # The tables are:
 # Tier 1                    <-- this is already checked by main CI, so we ignore it here
@@ -9,7 +9,7 @@
 # Tier 2 without host tools <-- and also this
 # Tier 3
 for table in soup.find_all("table")[1:3]:
-    for row in table.find_all('tr'):
-        code = row.find('code')
+    for row in table.find_all("tr"):
+        code = row.find("code")
         if code is not None:
             print(code.text)

--- /checkout/.jjconflict-base-2/src/tools/miri/test-cargo-miri/run-test.py
+++ /checkout/.jjconflict-base-2/src/tools/miri/test-cargo-miri/run-test.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-'''
+"""
 Test whether cargo-miri works properly.
---
@@ -12,17 +12,19 @@
 import sys
 import argparse
 
-CGREEN  = '\33[32m'
-CBOLD   = '\33[1m'
-CEND    = '\33[0m'
+CGREEN = "\33[32m"
+CBOLD = "\33[1m"
+CEND = "\33[0m"
 
 CARGO_EXTRA_FLAGS = os.environ.get("CARGO_EXTRA_FLAGS", "").split()
 
+
 def fail(msg):
     print("\nTEST FAIL: {}".format(msg))
     sys.exit(1)
 
-def cargo_miri(cmd, quiet = True, targets = None):
+
+def cargo_miri(cmd, quiet=True, targets=None):
     args = ["cargo", "miri", cmd] + CARGO_EXTRA_FLAGS
     if quiet:
         args += ["-q"]
@@ -35,15 +37,19 @@
 
     return args
 
+
 def normalize_stdout(str):
-    str = str.replace("src\\", "src/") # normalize paths across platforms
-    str = re.sub("\\b\\d+\\.\\d+s\\b", "$TIME", str) # the time keeps changing, obviously
+    str = str.replace("src\\", "src/")  # normalize paths across platforms
+    str = re.sub(
+        "\\b\\d+\\.\\d+s\\b", "$TIME", str
+    )  # the time keeps changing, obviously
     return str
 
+
 def check_output(actual, path, name):
     if ARGS.bless:
         # Write the output only if bless is set
-        open(path, mode='w').write(actual)
+        open(path, mode="w").write(actual)
         return True
     expected = open(path).read()
     if expected == actual:
@@ -56,7 +62,8 @@
     print(f"--- END diff {name} ---")
     return False
 
-def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
+
+def test(name, cmd, stdout_ref, stderr_ref, stdin=b"", env=None):
     if env is None:
         env = {}
     print("Testing {}...".format(name))
@@ -82,6 +89,7 @@
         return
     fail("exit code was {}".format(p.returncode))
 
+
 def test_no_rebuild(name, cmd, env=None):
     if env is None:
         env = {}
@@ -106,113 +114,174 @@
         print("--- END stderr ---")
         fail("Something was being rebuilt when it should not be (or we got no output)")
 
+
 def test_cargo_miri_run():
-    test("`cargo miri run` (no isolation)",
+    test(
+        "`cargo miri run` (no isolation)",
         cargo_miri("run"),
-        "run.default.stdout.ref", "run.default.stderr.ref",
-        stdin=b'12\n21\n',
+        "run.default.stdout.ref",
+        "run.default.stderr.ref",
+        stdin=b"12\n21\n",
         env={
-            'MIRIFLAGS': "-Zmiri-disable-isolation",
-            'MIRITESTVAR': "wrongval", # make sure the build.rs value takes precedence
+            "MIRIFLAGS": "-Zmiri-disable-isolation",
+            "MIRITESTVAR": "wrongval",  # make sure the build.rs value takes precedence
         },
     )
     # Special test: run it again *without* `-q` to make sure nothing is being rebuilt (Miri issue #1722)
-    test_no_rebuild("`cargo miri run` (no rebuild)",
+    test_no_rebuild(
+        "`cargo miri run` (no rebuild)",
         cargo_miri("run", quiet=False) + ["--", ""],
-        env={'MIRITESTVAR': "wrongval"}, # changing the env var causes a rebuild (re-runs build.rs),
-                                         # so keep it set
+        env={
+            "MIRITESTVAR": "wrongval"
+        },  # changing the env var causes a rebuild (re-runs build.rs),
+        # so keep it set
     )
     # This also covers passing arguments without `--`: Cargo will forward unused positional arguments to the program.
-    test("`cargo miri run` (with arguments and target)",
-        cargo_miri("run") + ["--bin", "cargo-miri-test", "hello world", '"hello world"', r'he\\llo\"world'],
-        "run.args.stdout.ref", "run.args.stderr.ref",
+    test(
+        "`cargo miri run` (with arguments and target)",
+        cargo_miri("run")
+        + [
+            "--bin",
+            "cargo-miri-test",
+            "hello world",
+            '"hello world"',
+            r"he\\llo\"world",
+        ],
+        "run.args.stdout.ref",
+        "run.args.stderr.ref",
     )
-    test("`cargo miri r` (subcrate, no isolation)",
+    test(
+        "`cargo miri r` (subcrate, no isolation)",
         cargo_miri("r") + ["-p", "subcrate"],
-        "run.subcrate.stdout.ref", "run.subcrate.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "run.subcrate.stdout.ref",
+        "run.subcrate.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri run` (custom target dir)",
+    test(
+        "`cargo miri run` (custom target dir)",
         # Attempt to confuse the argument parser.
-        cargo_miri("run") + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
-        "run.args.stdout.ref", "run.custom-target-dir.stderr.ref",
+        cargo_miri("run")
+        + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
+        "run.args.stdout.ref",
+        "run.custom-target-dir.stderr.ref",
     )
-    test("`cargo miri run` (test local crate detection)",
-         cargo_miri("run") + ["--package=test-local-crate-detection"],
-         "run.local_crate.stdout.ref", "run.local_crate.stderr.ref",
+    test(
+        "`cargo miri run` (test local crate detection)",
+        cargo_miri("run") + ["--package=test-local-crate-detection"],
+        "run.local_crate.stdout.ref",
+        "run.local_crate.stderr.ref",
     )
 
+
 def test_cargo_miri_test():
-    test("`cargo miri test`",
+    test(
+        "`cargo miri test`",
         cargo_miri("test"),
-        "test.default.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-seed=4242"},
+        "test.default.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-seed=4242"},
     )
-    test("`cargo miri test` (no isolation, no doctests)",
-        cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
-        "test.no-doc.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    test(
+        "`cargo miri test` (no isolation, no doctests)",
+        cargo_miri("test")
+        + ["--bins", "--tests"],  # no `--lib`, we disabled that in `Cargo.toml`
+        "test.no-doc.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (with filter)",
+    test(
+        "`cargo miri test` (with filter)",
         cargo_miri("test") + ["--", "--format=pretty", "pl"],
-        "test.filter.stdout.ref", "test.empty.ref",
+        "test.filter.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (test target)",
+    test(
+        "`cargo miri test` (test target)",
         cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
-        "test.test-target.stdout.ref", "test.empty.ref",
+        "test.test-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (bin target)",
+    test(
+        "`cargo miri test` (bin target)",
         cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
-        "test.bin-target.stdout.ref", "test.empty.ref",
+        "test.bin-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri t` (subcrate, no isolation)",
+    test(
+        "`cargo miri t` (subcrate, no isolation)",
         cargo_miri("t") + ["-p", "subcrate"],
         "test.subcrate.stdout.ref",
         "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (entire workspace, no isolation)",
+    test(
+        "`cargo miri test` (entire workspace, no isolation)",
         cargo_miri("test") + ["--workspace"],
-        "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "test.workspace.stdout.ref",
+        "test.workspace.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
     # FIXME: test is disabled for cross-compiled targets because it fails to link.
     # Related to <https://github.com/rust-lang/cargo/issues/17200>.
-    if not os.environ.get('MIRI_TESTS_CROSS_COMPILED'):
-        test("`cargo miri test` (entire workspace, no isolation, host-config)",
-            cargo_miri("test") + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
-            "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-            env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    if not os.environ.get("MIRI_TESTS_CROSS_COMPILED"):
+        test(
+            "`cargo miri test` (entire workspace, no isolation, host-config)",
+            cargo_miri("test")
+            + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
+            "test.workspace.stdout.ref",
+            "test.workspace.stderr.ref",
+            env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
         )
-    test("`cargo miri test` (custom target dir)",
+    test(
+        "`cargo miri test` (custom target dir)",
         cargo_miri("test") + ["--target-dir=custom-test"],
-        "test.default.stdout.ref", "test.empty.ref",
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
-    del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
-    test("`cargo miri test` (config-cli)",
-        cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
-        "test.default.stdout.ref", "test.empty.ref",
+    del os.environ[
+        "CARGO_TARGET_DIR"
+    ]  # this overrides `build.target-dir` passed by `--config`, so unset it
+    test(
+        "`cargo miri test` (config-cli)",
+        cargo_miri("test") + ['--config=build.target-dir="config-cli"'],
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
     if ARGS.multi_target:
         test_cargo_miri_multi_target()
 
 
 def test_cargo_miri_multi_target():
-    test("`cargo miri test` (multiple targets)",
-        cargo_miri("test", targets = ["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]),
-        "test.multiple_targets.stdout.ref", "test.empty.ref",
+    test(
+        "`cargo miri test` (multiple targets)",
+        cargo_miri(
+            "test", targets=["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]
+        ),
+        "test.multiple_targets.stdout.ref",
+        "test.empty.ref",
     )
 
-args_parser = argparse.ArgumentParser(description='`cargo miri` testing')
-args_parser.add_argument('--target', help='the target to test')
-args_parser.add_argument('--bless', help='bless the reference files', action='store_true')
-args_parser.add_argument('--multi-target', help='run tests related to multiple targets', action='store_true')
+
+args_parser = argparse.ArgumentParser(description="`cargo miri` testing")
+args_parser.add_argument("--target", help="the target to test")
+args_parser.add_argument(
+    "--bless", help="bless the reference files", action="store_true"
+)
+args_parser.add_argument(
+    "--multi-target", help="run tests related to multiple targets", action="store_true"
+)
 ARGS = args_parser.parse_args()
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
-os.environ["CARGO_TARGET_DIR"] = "target" # this affects the location of the target directory that we need to check
-os.environ["RUST_TEST_NOCAPTURE"] = "0" # this affects test output, so make sure it is not set
-os.environ["RUST_TEST_THREADS"] = "1" # avoid non-deterministic output due to concurrent test runs
+os.environ["CARGO_TARGET_DIR"] = (
+    "target"  # this affects the location of the target directory that we need to check
+)
+os.environ["RUST_TEST_NOCAPTURE"] = (
+    "0"  # this affects test output, so make sure it is not set
+)
+os.environ["RUST_TEST_THREADS"] = (
+    "1"  # avoid non-deterministic output due to concurrent test runs
+)
 
 target_str = " for target {}".format(ARGS.target) if ARGS.target else ""
 print(CGREEN + CBOLD + "## Running `cargo miri` tests{}".format(target_str) + CEND)

--- /checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
+++ /checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
@@ -38,8 +38,10 @@
                 if line == "};":
                     # We're done!
                     if found == 0:
-                        print("No intrinsics found in manual code even though we found the "
-                            "marker... Aborting...")
+                        print(
+                            "No intrinsics found in manual code even though we found the "
+                            "marker... Aborting..."
+                        )
                         return 1
                     for error in errors:
                         print("ERROR => {}".format(error))
@@ -50,12 +52,17 @@
                 found += 1
                 if parts[1] in intrinsics_map:
                     if parts[3] != intrinsics_map[parts[1]]:
-                        print("Same intrinsics (`{}` at line {}) but different GCC "
+                        print(
+                            "Same intrinsics (`{}` at line {}) but different GCC "
                             "translations: `{}` != `{}`".format(
-                                parts[1], pos, intrinsics_map[parts[1]], parts[3]))
+                                parts[1], pos, intrinsics_map[parts[1]], parts[3]
+                            )
+                        )
                     else:
-                        errors.append("Duplicated intrinsics: `{}` at line {}. Please remove it "
-                            " from manual code".format(parts[1], pos))
+                        errors.append(
+                            "Duplicated intrinsics: `{}` at line {}. Please remove it "
+                            " from manual code".format(parts[1], pos)
+                        )
             # Weird but whatever...
             return 1 if len(errors) != 0 else 0
         pos += 1

--- /checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-side-0/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -15,7 +15,11 @@
 def clone_repository(repo_name, path, repo_url, sub_paths):
     if os.path.exists(path):
         while True:
-            choice = input("There is already a `{}` folder, do you want to update it? [y/N]".format(path))
+            choice = input(
+                "There is already a `{}` folder, do you want to update it? [y/N]".format(
+                    path
+                )
+            )
             if choice == "" or choice.lower() == "n":
                 print("Skipping repository update.")
                 return
@@ -37,8 +41,8 @@
 
 
 def convert_to_string(content):
-    if content.__class__.__name__ == 'bytes':
-        return content.decode('utf-8')
+    if content.__class__.__name__ == "bytes":
+        return content.decode("utf-8")
     return content
 
 
@@ -109,17 +113,23 @@
 {indent8}{attribute} fn {arch}(name: &str,full_name:&str) -> &'static str {{
 {indent12}match name {{""")
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
-            out.write(f'{indent16}// {arch}\n')
+            out.write(f"{indent16}// {arch}\n")
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
-                    out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
+                    out.write(
+                        f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n'
+                    )
                 else:
                     out.write(f'{indent16}"{llvm_name}" => "{entry[1]}",\n')
-            out.write(f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n')
-            out.write(f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,")
+            out.write(
+                f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n'
+            )
+            out.write(
+                f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,"
+            )
         out.write(f"""{indent4}_ => {{
 {indent8}match old_arch_res {{
 {indent8}ArchCheckResult::UnknownIntrinsic => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),
@@ -146,6 +156,7 @@
     )
     update_intrinsics(llvm_path)
 
+
 # llvm-tblgen can be built with:
 #
 # mkdir llvm-tblgen-build && cd llvm-tblgen-build

--- /checkout/.jjconflict-side-0/src/tools/clippy/util/versions.py
+++ /checkout/.jjconflict-side-0/src/tools/clippy/util/versions.py
@@ -5,9 +5,10 @@
 import os
 import sys
 
+
 def key(v):
     if v == "stable":
-        return sys.maxsize 
+        return sys.maxsize
     if v == "beta":
         return sys.maxsize - 1
---
 
+
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("input", help="path to the versions.html template", type=argparse.FileType("r"))
+    parser.add_argument(
+        "input", help="path to the versions.html template", type=argparse.FileType("r")
+    )
     parser.add_argument("outdir", help="path to write the output HTML")
     args = parser.parse_args()
 
-    versions = [
-        dir
-        for dir in os.listdir(args.outdir)
-        if key(dir) is not None
+    versions = [dir for dir in os.listdir(args.outdir) if key(dir) is not None]
+    versions.sort(key=key, reverse=True)
+    links = [
+        f'<a class="list-group-item" href="./{version}/index.html">{version}</a>'
+        for version in versions
     ]
-    versions.sort(key=key, reverse=True)
-    links = [f'<a class="list-group-item" href="./{version}/index.html">{version}</a>' for version in versions]
 
     template = Template(args.input.read())
     html = template.substitute(list="\n".join(links))
@@ -47,5 +50,6 @@
         out.write(html)
         print(f"wrote HTML to {path}")
 
+
 if __name__ == "__main__":
     main()

--- /checkout/.jjconflict-side-0/src/tools/miri/ci/scrape-targets.py
+++ /checkout/.jjconflict-side-0/src/tools/miri/ci/scrape-targets.py
@@ -1,7 +1,7 @@
 import sys
 from bs4 import BeautifulSoup
 
-html = open(sys.argv[1], 'r').read()
+html = open(sys.argv[1], "r").read()
 soup = BeautifulSoup(html, features="html.parser")
 # The tables are:
 # Tier 1                    <-- this is already checked by main CI, so we ignore it here
@@ -9,7 +9,7 @@
 # Tier 2 without host tools <-- and also this
 # Tier 3
 for table in soup.find_all("table")[1:3]:
-    for row in table.find_all('tr'):
-        code = row.find('code')
+    for row in table.find_all("tr"):
+        code = row.find("code")
         if code is not None:
             print(code.text)

--- /checkout/.jjconflict-side-0/src/tools/miri/test-cargo-miri/run-test.py
+++ /checkout/.jjconflict-side-0/src/tools/miri/test-cargo-miri/run-test.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-'''
+"""
 Test whether cargo-miri works properly.
---
@@ -12,17 +12,19 @@
 import sys
 import argparse
 
-CGREEN  = '\33[32m'
-CBOLD   = '\33[1m'
-CEND    = '\33[0m'
+CGREEN = "\33[32m"
+CBOLD = "\33[1m"
+CEND = "\33[0m"
 
 CARGO_EXTRA_FLAGS = os.environ.get("CARGO_EXTRA_FLAGS", "").split()
 
+
 def fail(msg):
     print("\nTEST FAIL: {}".format(msg))
     sys.exit(1)
 
-def cargo_miri(cmd, quiet = True, targets = None):
+
+def cargo_miri(cmd, quiet=True, targets=None):
     args = ["cargo", "miri", cmd] + CARGO_EXTRA_FLAGS
     if quiet:
         args += ["-q"]
@@ -35,15 +37,19 @@
 
     return args
 
+
 def normalize_stdout(str):
-    str = str.replace("src\\", "src/") # normalize paths across platforms
-    str = re.sub("\\b\\d+\\.\\d+s\\b", "$TIME", str) # the time keeps changing, obviously
+    str = str.replace("src\\", "src/")  # normalize paths across platforms
+    str = re.sub(
+        "\\b\\d+\\.\\d+s\\b", "$TIME", str
+    )  # the time keeps changing, obviously
     return str
 
+
 def check_output(actual, path, name):
     if ARGS.bless:
         # Write the output only if bless is set
-        open(path, mode='w').write(actual)
+        open(path, mode="w").write(actual)
         return True
     expected = open(path).read()
     if expected == actual:
@@ -56,7 +62,8 @@
     print(f"--- END diff {name} ---")
     return False
 
-def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
+
+def test(name, cmd, stdout_ref, stderr_ref, stdin=b"", env=None):
     if env is None:
         env = {}
     print("Testing {}...".format(name))
@@ -82,6 +89,7 @@
         return
     fail("exit code was {}".format(p.returncode))
 
+
 def test_no_rebuild(name, cmd, env=None):
     if env is None:
         env = {}
@@ -106,113 +114,174 @@
         print("--- END stderr ---")
         fail("Something was being rebuilt when it should not be (or we got no output)")
 
+
 def test_cargo_miri_run():
-    test("`cargo miri run` (no isolation)",
+    test(
+        "`cargo miri run` (no isolation)",
         cargo_miri("run"),
-        "run.default.stdout.ref", "run.default.stderr.ref",
-        stdin=b'12\n21\n',
+        "run.default.stdout.ref",
+        "run.default.stderr.ref",
+        stdin=b"12\n21\n",
         env={
-            'MIRIFLAGS': "-Zmiri-disable-isolation",
-            'MIRITESTVAR': "wrongval", # make sure the build.rs value takes precedence
+            "MIRIFLAGS": "-Zmiri-disable-isolation",
+            "MIRITESTVAR": "wrongval",  # make sure the build.rs value takes precedence
         },
     )
     # Special test: run it again *without* `-q` to make sure nothing is being rebuilt (Miri issue #1722)
-    test_no_rebuild("`cargo miri run` (no rebuild)",
+    test_no_rebuild(
+        "`cargo miri run` (no rebuild)",
         cargo_miri("run", quiet=False) + ["--", ""],
-        env={'MIRITESTVAR': "wrongval"}, # changing the env var causes a rebuild (re-runs build.rs),
-                                         # so keep it set
+        env={
+            "MIRITESTVAR": "wrongval"
+        },  # changing the env var causes a rebuild (re-runs build.rs),
+        # so keep it set
     )
     # This also covers passing arguments without `--`: Cargo will forward unused positional arguments to the program.
-    test("`cargo miri run` (with arguments and target)",
-        cargo_miri("run") + ["--bin", "cargo-miri-test", "hello world", '"hello world"', r'he\\llo\"world'],
-        "run.args.stdout.ref", "run.args.stderr.ref",
+    test(
+        "`cargo miri run` (with arguments and target)",
+        cargo_miri("run")
+        + [
+            "--bin",
+            "cargo-miri-test",
+            "hello world",
+            '"hello world"',
+            r"he\\llo\"world",
+        ],
+        "run.args.stdout.ref",
+        "run.args.stderr.ref",
     )
-    test("`cargo miri r` (subcrate, no isolation)",
+    test(
+        "`cargo miri r` (subcrate, no isolation)",
         cargo_miri("r") + ["-p", "subcrate"],
-        "run.subcrate.stdout.ref", "run.subcrate.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "run.subcrate.stdout.ref",
+        "run.subcrate.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri run` (custom target dir)",
+    test(
+        "`cargo miri run` (custom target dir)",
         # Attempt to confuse the argument parser.
-        cargo_miri("run") + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
-        "run.args.stdout.ref", "run.custom-target-dir.stderr.ref",
+        cargo_miri("run")
+        + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
+        "run.args.stdout.ref",
+        "run.custom-target-dir.stderr.ref",
     )
-    test("`cargo miri run` (test local crate detection)",
-         cargo_miri("run") + ["--package=test-local-crate-detection"],
-         "run.local_crate.stdout.ref", "run.local_crate.stderr.ref",
+    test(
+        "`cargo miri run` (test local crate detection)",
+        cargo_miri("run") + ["--package=test-local-crate-detection"],
+        "run.local_crate.stdout.ref",
+        "run.local_crate.stderr.ref",
     )
 
+
 def test_cargo_miri_test():
-    test("`cargo miri test`",
+    test(
+        "`cargo miri test`",
         cargo_miri("test"),
-        "test.default.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-seed=4242"},
+        "test.default.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-seed=4242"},
     )
-    test("`cargo miri test` (no isolation, no doctests)",
-        cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
-        "test.no-doc.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    test(
+        "`cargo miri test` (no isolation, no doctests)",
+        cargo_miri("test")
+        + ["--bins", "--tests"],  # no `--lib`, we disabled that in `Cargo.toml`
+        "test.no-doc.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (with filter)",
+    test(
+        "`cargo miri test` (with filter)",
         cargo_miri("test") + ["--", "--format=pretty", "pl"],
-        "test.filter.stdout.ref", "test.empty.ref",
+        "test.filter.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (test target)",
+    test(
+        "`cargo miri test` (test target)",
         cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
-        "test.test-target.stdout.ref", "test.empty.ref",
+        "test.test-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (bin target)",
+    test(
+        "`cargo miri test` (bin target)",
         cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
-        "test.bin-target.stdout.ref", "test.empty.ref",
+        "test.bin-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri t` (subcrate, no isolation)",
+    test(
+        "`cargo miri t` (subcrate, no isolation)",
         cargo_miri("t") + ["-p", "subcrate"],
         "test.subcrate.stdout.ref",
         "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (entire workspace, no isolation)",
+    test(
+        "`cargo miri test` (entire workspace, no isolation)",
         cargo_miri("test") + ["--workspace"],
-        "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "test.workspace.stdout.ref",
+        "test.workspace.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
     # FIXME: test is disabled for cross-compiled targets because it fails to link.
     # Related to <https://github.com/rust-lang/cargo/issues/17200>.
-    if not os.environ.get('MIRI_TESTS_CROSS_COMPILED'):
-        test("`cargo miri test` (entire workspace, no isolation, host-config)",
-            cargo_miri("test") + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
-            "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-            env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    if not os.environ.get("MIRI_TESTS_CROSS_COMPILED"):
+        test(
+            "`cargo miri test` (entire workspace, no isolation, host-config)",
+            cargo_miri("test")
+            + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
+            "test.workspace.stdout.ref",
+            "test.workspace.stderr.ref",
+            env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
         )
-    test("`cargo miri test` (custom target dir)",
+    test(
+        "`cargo miri test` (custom target dir)",
         cargo_miri("test") + ["--target-dir=custom-test"],
-        "test.default.stdout.ref", "test.empty.ref",
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
-    del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
-    test("`cargo miri test` (config-cli)",
-        cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
-        "test.default.stdout.ref", "test.empty.ref",
+    del os.environ[
+        "CARGO_TARGET_DIR"
+    ]  # this overrides `build.target-dir` passed by `--config`, so unset it
+    test(
+        "`cargo miri test` (config-cli)",
+        cargo_miri("test") + ['--config=build.target-dir="config-cli"'],
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
     if ARGS.multi_target:
         test_cargo_miri_multi_target()
 
 
 def test_cargo_miri_multi_target():
-    test("`cargo miri test` (multiple targets)",
-        cargo_miri("test", targets = ["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]),
-        "test.multiple_targets.stdout.ref", "test.empty.ref",
+    test(
+        "`cargo miri test` (multiple targets)",
+        cargo_miri(
+            "test", targets=["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]
+        ),
+        "test.multiple_targets.stdout.ref",
+        "test.empty.ref",
     )
 
-args_parser = argparse.ArgumentParser(description='`cargo miri` testing')
-args_parser.add_argument('--target', help='the target to test')
-args_parser.add_argument('--bless', help='bless the reference files', action='store_true')
-args_parser.add_argument('--multi-target', help='run tests related to multiple targets', action='store_true')
+
+args_parser = argparse.ArgumentParser(description="`cargo miri` testing")
+args_parser.add_argument("--target", help="the target to test")
+args_parser.add_argument(
+    "--bless", help="bless the reference files", action="store_true"
+)
+args_parser.add_argument(
+    "--multi-target", help="run tests related to multiple targets", action="store_true"
+)
 ARGS = args_parser.parse_args()
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
-os.environ["CARGO_TARGET_DIR"] = "target" # this affects the location of the target directory that we need to check
-os.environ["RUST_TEST_NOCAPTURE"] = "0" # this affects test output, so make sure it is not set
-os.environ["RUST_TEST_THREADS"] = "1" # avoid non-deterministic output due to concurrent test runs
+os.environ["CARGO_TARGET_DIR"] = (
+    "target"  # this affects the location of the target directory that we need to check
+)
+os.environ["RUST_TEST_NOCAPTURE"] = (
+    "0"  # this affects test output, so make sure it is not set
+)
+os.environ["RUST_TEST_THREADS"] = (
+    "1"  # avoid non-deterministic output due to concurrent test runs
+)
 
 target_str = " for target {}".format(ARGS.target) if ARGS.target else ""
 print(CGREEN + CBOLD + "## Running `cargo miri` tests{}".format(target_str) + CEND)

--- /checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
+++ /checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
@@ -38,8 +38,10 @@
                 if line == "};":
                     # We're done!
                     if found == 0:
-                        print("No intrinsics found in manual code even though we found the "
-                            "marker... Aborting...")
+                        print(
+                            "No intrinsics found in manual code even though we found the "
+                            "marker... Aborting..."
+                        )
                         return 1
                     for error in errors:
                         print("ERROR => {}".format(error))
@@ -50,12 +52,17 @@
                 found += 1
                 if parts[1] in intrinsics_map:
                     if parts[3] != intrinsics_map[parts[1]]:
-                        print("Same intrinsics (`{}` at line {}) but different GCC "
+                        print(
+                            "Same intrinsics (`{}` at line {}) but different GCC "
                             "translations: `{}` != `{}`".format(
-                                parts[1], pos, intrinsics_map[parts[1]], parts[3]))
+                                parts[1], pos, intrinsics_map[parts[1]], parts[3]
+                            )
+                        )
                     else:
-                        errors.append("Duplicated intrinsics: `{}` at line {}. Please remove it "
-                            " from manual code".format(parts[1], pos))
+                        errors.append(
+                            "Duplicated intrinsics: `{}` at line {}. Please remove it "
+                            " from manual code".format(parts[1], pos)
+                        )
             # Weird but whatever...
             return 1 if len(errors) != 0 else 0
         pos += 1

--- /checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-side-1/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -15,7 +15,11 @@
 def clone_repository(repo_name, path, repo_url, sub_paths):
     if os.path.exists(path):
         while True:
-            choice = input("There is already a `{}` folder, do you want to update it? [y/N]".format(path))
+            choice = input(
+                "There is already a `{}` folder, do you want to update it? [y/N]".format(
+                    path
+                )
+            )
             if choice == "" or choice.lower() == "n":
                 print("Skipping repository update.")
                 return
@@ -37,8 +41,8 @@
 
 
 def convert_to_string(content):
-    if content.__class__.__name__ == 'bytes':
-        return content.decode('utf-8')
+    if content.__class__.__name__ == "bytes":
+        return content.decode("utf-8")
     return content
 
 
@@ -109,17 +113,23 @@
 {indent8}{attribute} fn {arch}(name: &str,full_name:&str) -> &'static str {{
 {indent12}match name {{""")
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
-            out.write(f'{indent16}// {arch}\n')
+            out.write(f"{indent16}// {arch}\n")
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
-                    out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
+                    out.write(
+                        f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n'
+                    )
                 else:
                     out.write(f'{indent16}"{llvm_name}" => "{entry[1]}",\n')
-            out.write(f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n')
-            out.write(f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,")
+            out.write(
+                f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n'
+            )
+            out.write(
+                f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,"
+            )
         out.write(f"""{indent4}_ => {{
 {indent8}match old_arch_res {{
 {indent8}ArchCheckResult::UnknownIntrinsic => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),
@@ -146,6 +156,7 @@
     )
     update_intrinsics(llvm_path)
 
+
 # llvm-tblgen can be built with:
 #
 # mkdir llvm-tblgen-build && cd llvm-tblgen-build

--- /checkout/.jjconflict-side-1/src/tools/clippy/util/versions.py
+++ /checkout/.jjconflict-side-1/src/tools/clippy/util/versions.py
@@ -5,9 +5,10 @@
 import os
 import sys
 
+
 def key(v):
     if v == "stable":
-        return sys.maxsize 
+        return sys.maxsize
     if v == "beta":
         return sys.maxsize - 1
---
 
+
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("input", help="path to the versions.html template", type=argparse.FileType("r"))
+    parser.add_argument(
+        "input", help="path to the versions.html template", type=argparse.FileType("r")
+    )
     parser.add_argument("outdir", help="path to write the output HTML")
     args = parser.parse_args()
 
-    versions = [
-        dir
-        for dir in os.listdir(args.outdir)
-        if key(dir) is not None
+    versions = [dir for dir in os.listdir(args.outdir) if key(dir) is not None]
+    versions.sort(key=key, reverse=True)
+    links = [
+        f'<a class="list-group-item" href="./{version}/index.html">{version}</a>'
+        for version in versions
     ]
-    versions.sort(key=key, reverse=True)
-    links = [f'<a class="list-group-item" href="./{version}/index.html">{version}</a>' for version in versions]
 
     template = Template(args.input.read())
     html = template.substitute(list="\n".join(links))
@@ -47,5 +50,6 @@
         out.write(html)
         print(f"wrote HTML to {path}")
 
+
 if __name__ == "__main__":
     main()

--- /checkout/.jjconflict-side-1/src/tools/miri/ci/scrape-targets.py
+++ /checkout/.jjconflict-side-1/src/tools/miri/ci/scrape-targets.py
@@ -1,7 +1,7 @@
 import sys
 from bs4 import BeautifulSoup
 
-html = open(sys.argv[1], 'r').read()
+html = open(sys.argv[1], "r").read()
 soup = BeautifulSoup(html, features="html.parser")
 # The tables are:
 # Tier 1                    <-- this is already checked by main CI, so we ignore it here
@@ -9,7 +9,7 @@
 # Tier 2 without host tools <-- and also this
 # Tier 3
 for table in soup.find_all("table")[1:3]:
-    for row in table.find_all('tr'):
-        code = row.find('code')
+    for row in table.find_all("tr"):
+        code = row.find("code")
         if code is not None:
             print(code.text)

--- /checkout/.jjconflict-side-1/src/tools/miri/test-cargo-miri/run-test.py
+++ /checkout/.jjconflict-side-1/src/tools/miri/test-cargo-miri/run-test.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-'''
+"""
 Test whether cargo-miri works properly.
---
@@ -12,17 +12,19 @@
 import sys
 import argparse
 
-CGREEN  = '\33[32m'
-CBOLD   = '\33[1m'
-CEND    = '\33[0m'
+CGREEN = "\33[32m"
+CBOLD = "\33[1m"
+CEND = "\33[0m"
 
 CARGO_EXTRA_FLAGS = os.environ.get("CARGO_EXTRA_FLAGS", "").split()
 
+
 def fail(msg):
     print("\nTEST FAIL: {}".format(msg))
     sys.exit(1)
 
-def cargo_miri(cmd, quiet = True, targets = None):
+
+def cargo_miri(cmd, quiet=True, targets=None):
     args = ["cargo", "miri", cmd] + CARGO_EXTRA_FLAGS
     if quiet:
         args += ["-q"]
@@ -35,15 +37,19 @@
 
     return args
 
+
 def normalize_stdout(str):
-    str = str.replace("src\\", "src/") # normalize paths across platforms
-    str = re.sub("\\b\\d+\\.\\d+s\\b", "$TIME", str) # the time keeps changing, obviously
+    str = str.replace("src\\", "src/")  # normalize paths across platforms
+    str = re.sub(
+        "\\b\\d+\\.\\d+s\\b", "$TIME", str
+    )  # the time keeps changing, obviously
     return str
 
+
 def check_output(actual, path, name):
     if ARGS.bless:
         # Write the output only if bless is set
-        open(path, mode='w').write(actual)
+        open(path, mode="w").write(actual)
         return True
     expected = open(path).read()
     if expected == actual:
@@ -56,7 +62,8 @@
     print(f"--- END diff {name} ---")
     return False
 
-def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
+
+def test(name, cmd, stdout_ref, stderr_ref, stdin=b"", env=None):
     if env is None:
         env = {}
     print("Testing {}...".format(name))
@@ -82,6 +89,7 @@
         return
     fail("exit code was {}".format(p.returncode))
 
+
 def test_no_rebuild(name, cmd, env=None):
     if env is None:
         env = {}
@@ -106,113 +114,174 @@
         print("--- END stderr ---")
         fail("Something was being rebuilt when it should not be (or we got no output)")
 
+
 def test_cargo_miri_run():
-    test("`cargo miri run` (no isolation)",
+    test(
+        "`cargo miri run` (no isolation)",
         cargo_miri("run"),
-        "run.default.stdout.ref", "run.default.stderr.ref",
-        stdin=b'12\n21\n',
+        "run.default.stdout.ref",
+        "run.default.stderr.ref",
+        stdin=b"12\n21\n",
         env={
-            'MIRIFLAGS': "-Zmiri-disable-isolation",
-            'MIRITESTVAR': "wrongval", # make sure the build.rs value takes precedence
+            "MIRIFLAGS": "-Zmiri-disable-isolation",
+            "MIRITESTVAR": "wrongval",  # make sure the build.rs value takes precedence
         },
     )
     # Special test: run it again *without* `-q` to make sure nothing is being rebuilt (Miri issue #1722)
-    test_no_rebuild("`cargo miri run` (no rebuild)",
+    test_no_rebuild(
+        "`cargo miri run` (no rebuild)",
         cargo_miri("run", quiet=False) + ["--", ""],
-        env={'MIRITESTVAR': "wrongval"}, # changing the env var causes a rebuild (re-runs build.rs),
-                                         # so keep it set
+        env={
+            "MIRITESTVAR": "wrongval"
+        },  # changing the env var causes a rebuild (re-runs build.rs),
+        # so keep it set
     )
     # This also covers passing arguments without `--`: Cargo will forward unused positional arguments to the program.
-    test("`cargo miri run` (with arguments and target)",
-        cargo_miri("run") + ["--bin", "cargo-miri-test", "hello world", '"hello world"', r'he\\llo\"world'],
-        "run.args.stdout.ref", "run.args.stderr.ref",
+    test(
+        "`cargo miri run` (with arguments and target)",
+        cargo_miri("run")
+        + [
+            "--bin",
+            "cargo-miri-test",
+            "hello world",
+            '"hello world"',
+            r"he\\llo\"world",
+        ],
+        "run.args.stdout.ref",
+        "run.args.stderr.ref",
     )
-    test("`cargo miri r` (subcrate, no isolation)",
+    test(
+        "`cargo miri r` (subcrate, no isolation)",
         cargo_miri("r") + ["-p", "subcrate"],
-        "run.subcrate.stdout.ref", "run.subcrate.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "run.subcrate.stdout.ref",
+        "run.subcrate.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri run` (custom target dir)",
+    test(
+        "`cargo miri run` (custom target dir)",
         # Attempt to confuse the argument parser.
-        cargo_miri("run") + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
-        "run.args.stdout.ref", "run.custom-target-dir.stderr.ref",
+        cargo_miri("run")
+        + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
+        "run.args.stdout.ref",
+        "run.custom-target-dir.stderr.ref",
     )
-    test("`cargo miri run` (test local crate detection)",
-         cargo_miri("run") + ["--package=test-local-crate-detection"],
-         "run.local_crate.stdout.ref", "run.local_crate.stderr.ref",
+    test(
+        "`cargo miri run` (test local crate detection)",
+        cargo_miri("run") + ["--package=test-local-crate-detection"],
+        "run.local_crate.stdout.ref",
+        "run.local_crate.stderr.ref",
     )
 
+
 def test_cargo_miri_test():
-    test("`cargo miri test`",
+    test(
+        "`cargo miri test`",
         cargo_miri("test"),
-        "test.default.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-seed=4242"},
+        "test.default.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-seed=4242"},
     )
-    test("`cargo miri test` (no isolation, no doctests)",
-        cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
-        "test.no-doc.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    test(
+        "`cargo miri test` (no isolation, no doctests)",
+        cargo_miri("test")
+        + ["--bins", "--tests"],  # no `--lib`, we disabled that in `Cargo.toml`
+        "test.no-doc.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (with filter)",
+    test(
+        "`cargo miri test` (with filter)",
         cargo_miri("test") + ["--", "--format=pretty", "pl"],
-        "test.filter.stdout.ref", "test.empty.ref",
+        "test.filter.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (test target)",
+    test(
+        "`cargo miri test` (test target)",
         cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
-        "test.test-target.stdout.ref", "test.empty.ref",
+        "test.test-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (bin target)",
+    test(
+        "`cargo miri test` (bin target)",
         cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
-        "test.bin-target.stdout.ref", "test.empty.ref",
+        "test.bin-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri t` (subcrate, no isolation)",
+    test(
+        "`cargo miri t` (subcrate, no isolation)",
         cargo_miri("t") + ["-p", "subcrate"],
         "test.subcrate.stdout.ref",
         "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (entire workspace, no isolation)",
+    test(
+        "`cargo miri test` (entire workspace, no isolation)",
         cargo_miri("test") + ["--workspace"],
-        "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "test.workspace.stdout.ref",
+        "test.workspace.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
     # FIXME: test is disabled for cross-compiled targets because it fails to link.
     # Related to <https://github.com/rust-lang/cargo/issues/17200>.
-    if not os.environ.get('MIRI_TESTS_CROSS_COMPILED'):
-        test("`cargo miri test` (entire workspace, no isolation, host-config)",
-            cargo_miri("test") + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
-            "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-            env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    if not os.environ.get("MIRI_TESTS_CROSS_COMPILED"):
+        test(
+            "`cargo miri test` (entire workspace, no isolation, host-config)",
+            cargo_miri("test")
+            + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
+            "test.workspace.stdout.ref",
+            "test.workspace.stderr.ref",
+            env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
         )
-    test("`cargo miri test` (custom target dir)",
+    test(
+        "`cargo miri test` (custom target dir)",
         cargo_miri("test") + ["--target-dir=custom-test"],
-        "test.default.stdout.ref", "test.empty.ref",
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
-    del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
-    test("`cargo miri test` (config-cli)",
-        cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
-        "test.default.stdout.ref", "test.empty.ref",
+    del os.environ[
+        "CARGO_TARGET_DIR"
+    ]  # this overrides `build.target-dir` passed by `--config`, so unset it
+    test(
+        "`cargo miri test` (config-cli)",
+        cargo_miri("test") + ['--config=build.target-dir="config-cli"'],
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
     if ARGS.multi_target:
         test_cargo_miri_multi_target()
 
 
 def test_cargo_miri_multi_target():
-    test("`cargo miri test` (multiple targets)",
-        cargo_miri("test", targets = ["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]),
-        "test.multiple_targets.stdout.ref", "test.empty.ref",
+    test(
+        "`cargo miri test` (multiple targets)",
+        cargo_miri(
+            "test", targets=["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]
+        ),
+        "test.multiple_targets.stdout.ref",
+        "test.empty.ref",
     )
 
-args_parser = argparse.ArgumentParser(description='`cargo miri` testing')
-args_parser.add_argument('--target', help='the target to test')
-args_parser.add_argument('--bless', help='bless the reference files', action='store_true')
-args_parser.add_argument('--multi-target', help='run tests related to multiple targets', action='store_true')
+
+args_parser = argparse.ArgumentParser(description="`cargo miri` testing")
+args_parser.add_argument("--target", help="the target to test")
+args_parser.add_argument(
+    "--bless", help="bless the reference files", action="store_true"
+)
+args_parser.add_argument(
+    "--multi-target", help="run tests related to multiple targets", action="store_true"
+)
 ARGS = args_parser.parse_args()
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
-os.environ["CARGO_TARGET_DIR"] = "target" # this affects the location of the target directory that we need to check
-os.environ["RUST_TEST_NOCAPTURE"] = "0" # this affects test output, so make sure it is not set
-os.environ["RUST_TEST_THREADS"] = "1" # avoid non-deterministic output due to concurrent test runs
+os.environ["CARGO_TARGET_DIR"] = (
+    "target"  # this affects the location of the target directory that we need to check
+)
+os.environ["RUST_TEST_NOCAPTURE"] = (
+    "0"  # this affects test output, so make sure it is not set
+)
+os.environ["RUST_TEST_THREADS"] = (
+    "1"  # avoid non-deterministic output due to concurrent test runs
+)
 
 target_str = " for target {}".format(ARGS.target) if ARGS.target else ""
 print(CGREEN + CBOLD + "## Running `cargo miri` tests{}".format(target_str) + CEND)

--- /checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
+++ /checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
@@ -38,8 +38,10 @@
                 if line == "};":
                     # We're done!
                     if found == 0:
-                        print("No intrinsics found in manual code even though we found the "
-                            "marker... Aborting...")
+                        print(
+                            "No intrinsics found in manual code even though we found the "
+                            "marker... Aborting..."
+                        )
                         return 1
                     for error in errors:
                         print("ERROR => {}".format(error))
@@ -50,12 +52,17 @@
                 found += 1
                 if parts[1] in intrinsics_map:
                     if parts[3] != intrinsics_map[parts[1]]:
-                        print("Same intrinsics (`{}` at line {}) but different GCC "
+                        print(
+                            "Same intrinsics (`{}` at line {}) but different GCC "
                             "translations: `{}` != `{}`".format(
-                                parts[1], pos, intrinsics_map[parts[1]], parts[3]))
+                                parts[1], pos, intrinsics_map[parts[1]], parts[3]
+                            )
+                        )
                     else:
-                        errors.append("Duplicated intrinsics: `{}` at line {}. Please remove it "
-                            " from manual code".format(parts[1], pos))
+                        errors.append(
+                            "Duplicated intrinsics: `{}` at line {}. Please remove it "
+                            " from manual code".format(parts[1], pos)
+                        )
             # Weird but whatever...
             return 1 if len(errors) != 0 else 0
         pos += 1

--- /checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-side-2/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -15,7 +15,11 @@
 def clone_repository(repo_name, path, repo_url, sub_paths):
     if os.path.exists(path):
         while True:
-            choice = input("There is already a `{}` folder, do you want to update it? [y/N]".format(path))
+            choice = input(
+                "There is already a `{}` folder, do you want to update it? [y/N]".format(
+                    path
+                )
+            )
             if choice == "" or choice.lower() == "n":
                 print("Skipping repository update.")
                 return
@@ -37,8 +41,8 @@
 
 
 def convert_to_string(content):
-    if content.__class__.__name__ == 'bytes':
-        return content.decode('utf-8')
+    if content.__class__.__name__ == "bytes":
+        return content.decode("utf-8")
     return content
 
 
@@ -109,17 +113,23 @@
 {indent8}{attribute} fn {arch}(name: &str,full_name:&str) -> &'static str {{
 {indent12}match name {{""")
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
-            out.write(f'{indent16}// {arch}\n')
+            out.write(f"{indent16}// {arch}\n")
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
-                    out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
+                    out.write(
+                        f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n'
+                    )
                 else:
                     out.write(f'{indent16}"{llvm_name}" => "{entry[1]}",\n')
-            out.write(f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n')
-            out.write(f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,")
+            out.write(
+                f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n'
+            )
+            out.write(
+                f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,"
+            )
         out.write(f"""{indent4}_ => {{
 {indent8}match old_arch_res {{
 {indent8}ArchCheckResult::UnknownIntrinsic => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),
@@ -146,6 +156,7 @@
     )
     update_intrinsics(llvm_path)
 
+
 # llvm-tblgen can be built with:
 #
 # mkdir llvm-tblgen-build && cd llvm-tblgen-build

--- /checkout/.jjconflict-side-2/src/tools/clippy/util/versions.py
+++ /checkout/.jjconflict-side-2/src/tools/clippy/util/versions.py
@@ -5,9 +5,10 @@
 import os
 import sys
 
+
 def key(v):
     if v == "stable":
-        return sys.maxsize 
+        return sys.maxsize
     if v == "beta":
         return sys.maxsize - 1
---
 
+
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("input", help="path to the versions.html template", type=argparse.FileType("r"))
+    parser.add_argument(
+        "input", help="path to the versions.html template", type=argparse.FileType("r")
+    )
     parser.add_argument("outdir", help="path to write the output HTML")
     args = parser.parse_args()
 
-    versions = [
-        dir
-        for dir in os.listdir(args.outdir)
-        if key(dir) is not None
+    versions = [dir for dir in os.listdir(args.outdir) if key(dir) is not None]
+    versions.sort(key=key, reverse=True)
+    links = [
+        f'<a class="list-group-item" href="./{version}/index.html">{version}</a>'
+        for version in versions
     ]
-    versions.sort(key=key, reverse=True)
-    links = [f'<a class="list-group-item" href="./{version}/index.html">{version}</a>' for version in versions]
 
     template = Template(args.input.read())
     html = template.substitute(list="\n".join(links))
@@ -47,5 +50,6 @@
         out.write(html)
         print(f"wrote HTML to {path}")
 
+
 if __name__ == "__main__":
     main()

--- /checkout/.jjconflict-side-2/src/tools/miri/ci/scrape-targets.py
+++ /checkout/.jjconflict-side-2/src/tools/miri/ci/scrape-targets.py
@@ -1,7 +1,7 @@
 import sys
 from bs4 import BeautifulSoup
 
-html = open(sys.argv[1], 'r').read()
+html = open(sys.argv[1], "r").read()
 soup = BeautifulSoup(html, features="html.parser")
 # The tables are:
 # Tier 1                    <-- this is already checked by main CI, so we ignore it here
@@ -9,7 +9,7 @@
 # Tier 2 without host tools <-- and also this
 # Tier 3
 for table in soup.find_all("table")[1:3]:
-    for row in table.find_all('tr'):
-        code = row.find('code')
+    for row in table.find_all("tr"):
+        code = row.find("code")
         if code is not None:
             print(code.text)

--- /checkout/.jjconflict-side-2/src/tools/miri/test-cargo-miri/run-test.py
+++ /checkout/.jjconflict-side-2/src/tools/miri/test-cargo-miri/run-test.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-'''
+"""
 Test whether cargo-miri works properly.
---
@@ -12,17 +12,19 @@
 import sys
 import argparse
 
-CGREEN  = '\33[32m'
-CBOLD   = '\33[1m'
-CEND    = '\33[0m'
+CGREEN = "\33[32m"
+CBOLD = "\33[1m"
+CEND = "\33[0m"
 
 CARGO_EXTRA_FLAGS = os.environ.get("CARGO_EXTRA_FLAGS", "").split()
 
+
 def fail(msg):
     print("\nTEST FAIL: {}".format(msg))
     sys.exit(1)
 
-def cargo_miri(cmd, quiet = True, targets = None):
+
+def cargo_miri(cmd, quiet=True, targets=None):
     args = ["cargo", "miri", cmd] + CARGO_EXTRA_FLAGS
     if quiet:
         args += ["-q"]
@@ -35,15 +37,19 @@
 
     return args
 
+
 def normalize_stdout(str):
-    str = str.replace("src\\", "src/") # normalize paths across platforms
-    str = re.sub("\\b\\d+\\.\\d+s\\b", "$TIME", str) # the time keeps changing, obviously
+    str = str.replace("src\\", "src/")  # normalize paths across platforms
+    str = re.sub(
+        "\\b\\d+\\.\\d+s\\b", "$TIME", str
+    )  # the time keeps changing, obviously
     return str
 
+
 def check_output(actual, path, name):
     if ARGS.bless:
         # Write the output only if bless is set
-        open(path, mode='w').write(actual)
+        open(path, mode="w").write(actual)
         return True
     expected = open(path).read()
     if expected == actual:
@@ -56,7 +62,8 @@
     print(f"--- END diff {name} ---")
     return False
 
-def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
+
+def test(name, cmd, stdout_ref, stderr_ref, stdin=b"", env=None):
     if env is None:
         env = {}
     print("Testing {}...".format(name))
@@ -82,6 +89,7 @@
         return
     fail("exit code was {}".format(p.returncode))
 
+
 def test_no_rebuild(name, cmd, env=None):
     if env is None:
         env = {}
@@ -106,113 +114,174 @@
         print("--- END stderr ---")
         fail("Something was being rebuilt when it should not be (or we got no output)")
 
+
 def test_cargo_miri_run():
-    test("`cargo miri run` (no isolation)",
+    test(
+        "`cargo miri run` (no isolation)",
         cargo_miri("run"),
-        "run.default.stdout.ref", "run.default.stderr.ref",
-        stdin=b'12\n21\n',
+        "run.default.stdout.ref",
+        "run.default.stderr.ref",
+        stdin=b"12\n21\n",
         env={
-            'MIRIFLAGS': "-Zmiri-disable-isolation",
-            'MIRITESTVAR': "wrongval", # make sure the build.rs value takes precedence
+            "MIRIFLAGS": "-Zmiri-disable-isolation",
+            "MIRITESTVAR": "wrongval",  # make sure the build.rs value takes precedence
         },
     )
     # Special test: run it again *without* `-q` to make sure nothing is being rebuilt (Miri issue #1722)
-    test_no_rebuild("`cargo miri run` (no rebuild)",
+    test_no_rebuild(
+        "`cargo miri run` (no rebuild)",
         cargo_miri("run", quiet=False) + ["--", ""],
-        env={'MIRITESTVAR': "wrongval"}, # changing the env var causes a rebuild (re-runs build.rs),
-                                         # so keep it set
+        env={
+            "MIRITESTVAR": "wrongval"
+        },  # changing the env var causes a rebuild (re-runs build.rs),
+        # so keep it set
     )
     # This also covers passing arguments without `--`: Cargo will forward unused positional arguments to the program.
-    test("`cargo miri run` (with arguments and target)",
-        cargo_miri("run") + ["--bin", "cargo-miri-test", "hello world", '"hello world"', r'he\\llo\"world'],
-        "run.args.stdout.ref", "run.args.stderr.ref",
+    test(
+        "`cargo miri run` (with arguments and target)",
+        cargo_miri("run")
+        + [
+            "--bin",
+            "cargo-miri-test",
+            "hello world",
+            '"hello world"',
+            r"he\\llo\"world",
+        ],
+        "run.args.stdout.ref",
+        "run.args.stderr.ref",
     )
-    test("`cargo miri r` (subcrate, no isolation)",
+    test(
+        "`cargo miri r` (subcrate, no isolation)",
         cargo_miri("r") + ["-p", "subcrate"],
-        "run.subcrate.stdout.ref", "run.subcrate.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "run.subcrate.stdout.ref",
+        "run.subcrate.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri run` (custom target dir)",
+    test(
+        "`cargo miri run` (custom target dir)",
         # Attempt to confuse the argument parser.
-        cargo_miri("run") + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
-        "run.args.stdout.ref", "run.custom-target-dir.stderr.ref",
+        cargo_miri("run")
+        + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
+        "run.args.stdout.ref",
+        "run.custom-target-dir.stderr.ref",
     )
-    test("`cargo miri run` (test local crate detection)",
-         cargo_miri("run") + ["--package=test-local-crate-detection"],
-         "run.local_crate.stdout.ref", "run.local_crate.stderr.ref",
+    test(
+        "`cargo miri run` (test local crate detection)",
+        cargo_miri("run") + ["--package=test-local-crate-detection"],
+        "run.local_crate.stdout.ref",
+        "run.local_crate.stderr.ref",
     )
 
+
 def test_cargo_miri_test():
-    test("`cargo miri test`",
+    test(
+        "`cargo miri test`",
         cargo_miri("test"),
-        "test.default.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-seed=4242"},
+        "test.default.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-seed=4242"},
     )
-    test("`cargo miri test` (no isolation, no doctests)",
-        cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
-        "test.no-doc.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    test(
+        "`cargo miri test` (no isolation, no doctests)",
+        cargo_miri("test")
+        + ["--bins", "--tests"],  # no `--lib`, we disabled that in `Cargo.toml`
+        "test.no-doc.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (with filter)",
+    test(
+        "`cargo miri test` (with filter)",
         cargo_miri("test") + ["--", "--format=pretty", "pl"],
-        "test.filter.stdout.ref", "test.empty.ref",
+        "test.filter.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (test target)",
+    test(
+        "`cargo miri test` (test target)",
         cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
-        "test.test-target.stdout.ref", "test.empty.ref",
+        "test.test-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (bin target)",
+    test(
+        "`cargo miri test` (bin target)",
         cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
-        "test.bin-target.stdout.ref", "test.empty.ref",
+        "test.bin-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri t` (subcrate, no isolation)",
+    test(
+        "`cargo miri t` (subcrate, no isolation)",
         cargo_miri("t") + ["-p", "subcrate"],
         "test.subcrate.stdout.ref",
         "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (entire workspace, no isolation)",
+    test(
+        "`cargo miri test` (entire workspace, no isolation)",
         cargo_miri("test") + ["--workspace"],
-        "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "test.workspace.stdout.ref",
+        "test.workspace.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
     # FIXME: test is disabled for cross-compiled targets because it fails to link.
     # Related to <https://github.com/rust-lang/cargo/issues/17200>.
-    if not os.environ.get('MIRI_TESTS_CROSS_COMPILED'):
-        test("`cargo miri test` (entire workspace, no isolation, host-config)",
-            cargo_miri("test") + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
-            "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-            env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    if not os.environ.get("MIRI_TESTS_CROSS_COMPILED"):
+        test(
+            "`cargo miri test` (entire workspace, no isolation, host-config)",
+            cargo_miri("test")
+            + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
+            "test.workspace.stdout.ref",
+            "test.workspace.stderr.ref",
+            env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
         )
-    test("`cargo miri test` (custom target dir)",
+    test(
+        "`cargo miri test` (custom target dir)",
         cargo_miri("test") + ["--target-dir=custom-test"],
-        "test.default.stdout.ref", "test.empty.ref",
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
-    del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
-    test("`cargo miri test` (config-cli)",
-        cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
-        "test.default.stdout.ref", "test.empty.ref",
+    del os.environ[
+        "CARGO_TARGET_DIR"
+    ]  # this overrides `build.target-dir` passed by `--config`, so unset it
+    test(
+        "`cargo miri test` (config-cli)",
+        cargo_miri("test") + ['--config=build.target-dir="config-cli"'],
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
     if ARGS.multi_target:
         test_cargo_miri_multi_target()
 
 
 def test_cargo_miri_multi_target():
-    test("`cargo miri test` (multiple targets)",
-        cargo_miri("test", targets = ["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]),
-        "test.multiple_targets.stdout.ref", "test.empty.ref",
+    test(
+        "`cargo miri test` (multiple targets)",
+        cargo_miri(
+            "test", targets=["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]
+        ),
+        "test.multiple_targets.stdout.ref",
+        "test.empty.ref",
     )
 
-args_parser = argparse.ArgumentParser(description='`cargo miri` testing')
-args_parser.add_argument('--target', help='the target to test')
-args_parser.add_argument('--bless', help='bless the reference files', action='store_true')
-args_parser.add_argument('--multi-target', help='run tests related to multiple targets', action='store_true')
+
+args_parser = argparse.ArgumentParser(description="`cargo miri` testing")
+args_parser.add_argument("--target", help="the target to test")
+args_parser.add_argument(
+    "--bless", help="bless the reference files", action="store_true"
+)
+args_parser.add_argument(
+    "--multi-target", help="run tests related to multiple targets", action="store_true"
+)
 ARGS = args_parser.parse_args()
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
-os.environ["CARGO_TARGET_DIR"] = "target" # this affects the location of the target directory that we need to check
-os.environ["RUST_TEST_NOCAPTURE"] = "0" # this affects test output, so make sure it is not set
-os.environ["RUST_TEST_THREADS"] = "1" # avoid non-deterministic output due to concurrent test runs
+os.environ["CARGO_TARGET_DIR"] = (
+    "target"  # this affects the location of the target directory that we need to check
+)
+os.environ["RUST_TEST_NOCAPTURE"] = (
+    "0"  # this affects test output, so make sure it is not set
+)
+os.environ["RUST_TEST_THREADS"] = (
+    "1"  # avoid non-deterministic output due to concurrent test runs
+)
 
 target_str = " for target {}".format(ARGS.target) if ARGS.target else ""
 print(CGREEN + CBOLD + "## Running `cargo miri` tests{}".format(target_str) + CEND)

--- /checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
+++ /checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/check_intrinsics_duplicates.py
@@ -38,8 +38,10 @@
                 if line == "};":
                     # We're done!
                     if found == 0:
-                        print("No intrinsics found in manual code even though we found the "
-                            "marker... Aborting...")
+                        print(
+                            "No intrinsics found in manual code even though we found the "
+                            "marker... Aborting..."
+                        )
                         return 1
                     for error in errors:
                         print("ERROR => {}".format(error))
@@ -50,12 +52,17 @@
                 found += 1
                 if parts[1] in intrinsics_map:
                     if parts[3] != intrinsics_map[parts[1]]:
-                        print("Same intrinsics (`{}` at line {}) but different GCC "
+                        print(
+                            "Same intrinsics (`{}` at line {}) but different GCC "
                             "translations: `{}` != `{}`".format(
-                                parts[1], pos, intrinsics_map[parts[1]], parts[3]))
+                                parts[1], pos, intrinsics_map[parts[1]], parts[3]
+                            )
+                        )
                     else:
-                        errors.append("Duplicated intrinsics: `{}` at line {}. Please remove it "
-                            " from manual code".format(parts[1], pos))
+                        errors.append(
+                            "Duplicated intrinsics: `{}` at line {}. Please remove it "
+                            " from manual code".format(parts[1], pos)
+                        )
             # Weird but whatever...
             return 1 if len(errors) != 0 else 0
         pos += 1

--- /checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
+++ /checkout/.jjconflict-side-3/compiler/rustc_codegen_gcc/tools/generate_intrinsics.py
@@ -15,7 +15,11 @@
 def clone_repository(repo_name, path, repo_url, sub_paths):
     if os.path.exists(path):
         while True:
-            choice = input("There is already a `{}` folder, do you want to update it? [y/N]".format(path))
+            choice = input(
+                "There is already a `{}` folder, do you want to update it? [y/N]".format(
+                    path
+                )
+            )
             if choice == "" or choice.lower() == "n":
                 print("Skipping repository update.")
                 return
@@ -37,8 +41,8 @@
 
 
 def convert_to_string(content):
-    if content.__class__.__name__ == 'bytes':
-        return content.decode('utf-8')
+    if content.__class__.__name__ == "bytes":
+        return content.decode("utf-8")
     return content
 
 
@@ -109,17 +113,23 @@
 {indent8}{attribute} fn {arch}(name: &str,full_name:&str) -> &'static str {{
 {indent12}match name {{""")
             intrinsics[arch].sort(key=lambda x: (x[0], x[1]))
-            out.write(f'{indent16}// {arch}\n')
+            out.write(f"{indent16}// {arch}\n")
             for entry in intrinsics[arch]:
-                llvm_name = entry[0].removeprefix("llvm.");
-                llvm_name = llvm_name.removeprefix(arch);
-                llvm_name = llvm_name.removeprefix(".");
+                llvm_name = entry[0].removeprefix("llvm.")
+                llvm_name = llvm_name.removeprefix(arch)
+                llvm_name = llvm_name.removeprefix(".")
                 if "_round_mask" in entry[1]:
-                    out.write(f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n')
+                    out.write(
+                        f'{indent16}// [INVALID CONVERSION]: "{llvm_name}" => "{entry[1]}",\n'
+                    )
                 else:
                     out.write(f'{indent16}"{llvm_name}" => "{entry[1]}",\n')
-            out.write(f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n')
-            out.write(f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,")
+            out.write(
+                f'{indent16}_ => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),\n'
+            )
+            out.write(
+                f"{indent16}}}\n{indent12}}}\n{indent8}{arch}(name,full_name)\n{indent8}}}\n,"
+            )
         out.write(f"""{indent4}_ => {{
 {indent8}match old_arch_res {{
 {indent8}ArchCheckResult::UnknownIntrinsic => unimplemented!("***** unsupported LLVM intrinsic {{full_name}}"),
@@ -146,6 +156,7 @@
     )
     update_intrinsics(llvm_path)
 
+
 # llvm-tblgen can be built with:
 #
 # mkdir llvm-tblgen-build && cd llvm-tblgen-build

--- /checkout/.jjconflict-side-3/src/tools/clippy/util/versions.py
+++ /checkout/.jjconflict-side-3/src/tools/clippy/util/versions.py
@@ -5,9 +5,10 @@
 import os
 import sys
 
+
 def key(v):
     if v == "stable":
-        return sys.maxsize 
+        return sys.maxsize
     if v == "beta":
         return sys.maxsize - 1
---
 
+
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("input", help="path to the versions.html template", type=argparse.FileType("r"))
+    parser.add_argument(
+        "input", help="path to the versions.html template", type=argparse.FileType("r")
+    )
     parser.add_argument("outdir", help="path to write the output HTML")
     args = parser.parse_args()
 
-    versions = [
-        dir
-        for dir in os.listdir(args.outdir)
-        if key(dir) is not None
+    versions = [dir for dir in os.listdir(args.outdir) if key(dir) is not None]
+    versions.sort(key=key, reverse=True)
+    links = [
+        f'<a class="list-group-item" href="./{version}/index.html">{version}</a>'
+        for version in versions
     ]
-    versions.sort(key=key, reverse=True)
-    links = [f'<a class="list-group-item" href="./{version}/index.html">{version}</a>' for version in versions]
 
     template = Template(args.input.read())
     html = template.substitute(list="\n".join(links))
@@ -47,5 +50,6 @@
         out.write(html)
         print(f"wrote HTML to {path}")
 
+
 if __name__ == "__main__":
     main()

--- /checkout/.jjconflict-side-3/src/tools/miri/ci/scrape-targets.py
+++ /checkout/.jjconflict-side-3/src/tools/miri/ci/scrape-targets.py
@@ -1,7 +1,7 @@
 import sys
 from bs4 import BeautifulSoup
 
-html = open(sys.argv[1], 'r').read()
+html = open(sys.argv[1], "r").read()
 soup = BeautifulSoup(html, features="html.parser")
 # The tables are:
 # Tier 1                    <-- this is already checked by main CI, so we ignore it here
@@ -9,7 +9,7 @@
 # Tier 2 without host tools <-- and also this
 # Tier 3
 for table in soup.find_all("table")[1:3]:
-    for row in table.find_all('tr'):
-        code = row.find('code')
+    for row in table.find_all("tr"):
+        code = row.find("code")
         if code is not None:
             print(code.text)

--- /checkout/.jjconflict-side-3/src/tools/miri/test-cargo-miri/run-test.py
+++ /checkout/.jjconflict-side-3/src/tools/miri/test-cargo-miri/run-test.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-'''
+"""
 Test whether cargo-miri works properly.
---
@@ -12,17 +12,19 @@
 import sys
 import argparse
 
-CGREEN  = '\33[32m'
-CBOLD   = '\33[1m'
-CEND    = '\33[0m'
+CGREEN = "\33[32m"
+CBOLD = "\33[1m"
+CEND = "\33[0m"
 
 CARGO_EXTRA_FLAGS = os.environ.get("CARGO_EXTRA_FLAGS", "").split()
 
+
 def fail(msg):
     print("\nTEST FAIL: {}".format(msg))
     sys.exit(1)
 
-def cargo_miri(cmd, quiet = True, targets = None):
+
+def cargo_miri(cmd, quiet=True, targets=None):
     args = ["cargo", "miri", cmd] + CARGO_EXTRA_FLAGS
     if quiet:
         args += ["-q"]
@@ -35,15 +37,19 @@
 
     return args
 
+
 def normalize_stdout(str):
-    str = str.replace("src\\", "src/") # normalize paths across platforms
-    str = re.sub("\\b\\d+\\.\\d+s\\b", "$TIME", str) # the time keeps changing, obviously
+    str = str.replace("src\\", "src/")  # normalize paths across platforms
+    str = re.sub(
+        "\\b\\d+\\.\\d+s\\b", "$TIME", str
+    )  # the time keeps changing, obviously
     return str
 
+
 def check_output(actual, path, name):
     if ARGS.bless:
         # Write the output only if bless is set
-        open(path, mode='w').write(actual)
+        open(path, mode="w").write(actual)
         return True
     expected = open(path).read()
     if expected == actual:
@@ -56,7 +62,8 @@
     print(f"--- END diff {name} ---")
     return False
 
-def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
+
+def test(name, cmd, stdout_ref, stderr_ref, stdin=b"", env=None):
     if env is None:
         env = {}
     print("Testing {}...".format(name))
@@ -82,6 +89,7 @@
         return
     fail("exit code was {}".format(p.returncode))
 
+
 def test_no_rebuild(name, cmd, env=None):
     if env is None:
         env = {}
@@ -106,113 +114,174 @@
         print("--- END stderr ---")
         fail("Something was being rebuilt when it should not be (or we got no output)")
 
+
 def test_cargo_miri_run():
-    test("`cargo miri run` (no isolation)",
+    test(
+        "`cargo miri run` (no isolation)",
         cargo_miri("run"),
-        "run.default.stdout.ref", "run.default.stderr.ref",
-        stdin=b'12\n21\n',
+        "run.default.stdout.ref",
+        "run.default.stderr.ref",
+        stdin=b"12\n21\n",
         env={
-            'MIRIFLAGS': "-Zmiri-disable-isolation",
-            'MIRITESTVAR': "wrongval", # make sure the build.rs value takes precedence
+            "MIRIFLAGS": "-Zmiri-disable-isolation",
+            "MIRITESTVAR": "wrongval",  # make sure the build.rs value takes precedence
         },
     )
     # Special test: run it again *without* `-q` to make sure nothing is being rebuilt (Miri issue #1722)
-    test_no_rebuild("`cargo miri run` (no rebuild)",
+    test_no_rebuild(
+        "`cargo miri run` (no rebuild)",
         cargo_miri("run", quiet=False) + ["--", ""],
-        env={'MIRITESTVAR': "wrongval"}, # changing the env var causes a rebuild (re-runs build.rs),
-                                         # so keep it set
+        env={
+            "MIRITESTVAR": "wrongval"
+        },  # changing the env var causes a rebuild (re-runs build.rs),
+        # so keep it set
     )
     # This also covers passing arguments without `--`: Cargo will forward unused positional arguments to the program.
-    test("`cargo miri run` (with arguments and target)",
-        cargo_miri("run") + ["--bin", "cargo-miri-test", "hello world", '"hello world"', r'he\\llo\"world'],
-        "run.args.stdout.ref", "run.args.stderr.ref",
+    test(
+        "`cargo miri run` (with arguments and target)",
+        cargo_miri("run")
+        + [
+            "--bin",
+            "cargo-miri-test",
+            "hello world",
+            '"hello world"',
+            r"he\\llo\"world",
+        ],
+        "run.args.stdout.ref",
+        "run.args.stderr.ref",
     )
-    test("`cargo miri r` (subcrate, no isolation)",
+    test(
+        "`cargo miri r` (subcrate, no isolation)",
         cargo_miri("r") + ["-p", "subcrate"],
-        "run.subcrate.stdout.ref", "run.subcrate.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "run.subcrate.stdout.ref",
+        "run.subcrate.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri run` (custom target dir)",
+    test(
+        "`cargo miri run` (custom target dir)",
         # Attempt to confuse the argument parser.
-        cargo_miri("run") + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
-        "run.args.stdout.ref", "run.custom-target-dir.stderr.ref",
+        cargo_miri("run")
+        + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"],
+        "run.args.stdout.ref",
+        "run.custom-target-dir.stderr.ref",
     )
-    test("`cargo miri run` (test local crate detection)",
-         cargo_miri("run") + ["--package=test-local-crate-detection"],
-         "run.local_crate.stdout.ref", "run.local_crate.stderr.ref",
+    test(
+        "`cargo miri run` (test local crate detection)",
+        cargo_miri("run") + ["--package=test-local-crate-detection"],
+        "run.local_crate.stdout.ref",
+        "run.local_crate.stderr.ref",
     )
 
+
 def test_cargo_miri_test():
-    test("`cargo miri test`",
+    test(
+        "`cargo miri test`",
         cargo_miri("test"),
-        "test.default.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-seed=4242"},
+        "test.default.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-seed=4242"},
     )
-    test("`cargo miri test` (no isolation, no doctests)",
-        cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
-        "test.no-doc.stdout.ref", "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    test(
+        "`cargo miri test` (no isolation, no doctests)",
+        cargo_miri("test")
+        + ["--bins", "--tests"],  # no `--lib`, we disabled that in `Cargo.toml`
+        "test.no-doc.stdout.ref",
+        "test.empty.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (with filter)",
+    test(
+        "`cargo miri test` (with filter)",
         cargo_miri("test") + ["--", "--format=pretty", "pl"],
-        "test.filter.stdout.ref", "test.empty.ref",
+        "test.filter.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (test target)",
+    test(
+        "`cargo miri test` (test target)",
         cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
-        "test.test-target.stdout.ref", "test.empty.ref",
+        "test.test-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri test` (bin target)",
+    test(
+        "`cargo miri test` (bin target)",
         cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
-        "test.bin-target.stdout.ref", "test.empty.ref",
+        "test.bin-target.stdout.ref",
+        "test.empty.ref",
     )
-    test("`cargo miri t` (subcrate, no isolation)",
+    test(
+        "`cargo miri t` (subcrate, no isolation)",
         cargo_miri("t") + ["-p", "subcrate"],
         "test.subcrate.stdout.ref",
         "test.empty.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
-    test("`cargo miri test` (entire workspace, no isolation)",
+    test(
+        "`cargo miri test` (entire workspace, no isolation)",
         cargo_miri("test") + ["--workspace"],
-        "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-        env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+        "test.workspace.stdout.ref",
+        "test.workspace.stderr.ref",
+        env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
     )
     # FIXME: test is disabled for cross-compiled targets because it fails to link.
     # Related to <https://github.com/rust-lang/cargo/issues/17200>.
-    if not os.environ.get('MIRI_TESTS_CROSS_COMPILED'):
-        test("`cargo miri test` (entire workspace, no isolation, host-config)",
-            cargo_miri("test") + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
-            "test.workspace.stdout.ref", "test.workspace.stderr.ref",
-            env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
+    if not os.environ.get("MIRI_TESTS_CROSS_COMPILED"):
+        test(
+            "`cargo miri test` (entire workspace, no isolation, host-config)",
+            cargo_miri("test")
+            + ["--workspace", "-Ztarget-applies-to-host", "-Zhost-config"],
+            "test.workspace.stdout.ref",
+            "test.workspace.stderr.ref",
+            env={"MIRIFLAGS": "-Zmiri-disable-isolation"},
         )
-    test("`cargo miri test` (custom target dir)",
+    test(
+        "`cargo miri test` (custom target dir)",
         cargo_miri("test") + ["--target-dir=custom-test"],
-        "test.default.stdout.ref", "test.empty.ref",
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
-    del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
-    test("`cargo miri test` (config-cli)",
-        cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
-        "test.default.stdout.ref", "test.empty.ref",
+    del os.environ[
+        "CARGO_TARGET_DIR"
+    ]  # this overrides `build.target-dir` passed by `--config`, so unset it
+    test(
+        "`cargo miri test` (config-cli)",
+        cargo_miri("test") + ['--config=build.target-dir="config-cli"'],
+        "test.default.stdout.ref",
+        "test.empty.ref",
     )
     if ARGS.multi_target:
         test_cargo_miri_multi_target()
 
 
 def test_cargo_miri_multi_target():
-    test("`cargo miri test` (multiple targets)",
-        cargo_miri("test", targets = ["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]),
-        "test.multiple_targets.stdout.ref", "test.empty.ref",
+    test(
+        "`cargo miri test` (multiple targets)",
+        cargo_miri(
+            "test", targets=["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]
+        ),
+        "test.multiple_targets.stdout.ref",
+        "test.empty.ref",
     )
 
-args_parser = argparse.ArgumentParser(description='`cargo miri` testing')
-args_parser.add_argument('--target', help='the target to test')
-args_parser.add_argument('--bless', help='bless the reference files', action='store_true')
-args_parser.add_argument('--multi-target', help='run tests related to multiple targets', action='store_true')
+
+args_parser = argparse.ArgumentParser(description="`cargo miri` testing")
+args_parser.add_argument("--target", help="the target to test")
+args_parser.add_argument(
+    "--bless", help="bless the reference files", action="store_true"
+)
+args_parser.add_argument(
+    "--multi-target", help="run tests related to multiple targets", action="store_true"
+)
 ARGS = args_parser.parse_args()
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
-os.environ["CARGO_TARGET_DIR"] = "target" # this affects the location of the target directory that we need to check
-os.environ["RUST_TEST_NOCAPTURE"] = "0" # this affects test output, so make sure it is not set
-os.environ["RUST_TEST_THREADS"] = "1" # avoid non-deterministic output due to concurrent test runs
+os.environ["CARGO_TARGET_DIR"] = (
+    "target"  # this affects the location of the target directory that we need to check
+)
+os.environ["RUST_TEST_NOCAPTURE"] = (
+    "0"  # this affects test output, so make sure it is not set
+)
+os.environ["RUST_TEST_THREADS"] = (
+    "1"  # avoid non-deterministic output due to concurrent test runs
+)
 
 target_str = " for target {}".format(ARGS.target) if ARGS.target else ""
 print(CGREEN + CBOLD + "## Running `cargo miri` tests{}".format(target_str) + CEND)

35 files would be reformatted, 312 files already formatted
rerun with `--bless` to reformat Python code: `./x.py test tidy --extra-checks=py:fmt --bless`
tidy [extra_checks:python_fmt]: checks with external tool 'ruff' failed
tidy [extra_checks:python_fmt]: FAIL
checking C++ file formatting
spellchecking files
building external tool typos from package typos-cli@1.38.1
finished building tool typos
yarn install v1.22.22
---
Running eslint on rustdoc JS files
info: ES-Check: checking 7 files...
info: ✓ ES-Check passed! All files are ES10 compatible.
typechecking javascript files
tidy: The following checks failed: extra_checks:python_fmt, extra_checks:python_lint, features
Bootstrap failed while executing `test src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck`
Currently active steps:
test::Tidy {  } at src/bootstrap/src/core/build_steps/test.rs:1665
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/rust-tidy --root-path=/checkout --cargo-path=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo --output-dir=/checkout/obj/build --concurrency=4 --npm-path=/node/bin/yarn --ci=true --extra-checks=py,cpp,js,spellcheck` failed with exit code 1
Created at: src/bootstrap/src/core/build_steps/tool.rs:1627:23
Executed at: src/bootstrap/src/core/build_steps/test.rs:1747:29

Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:02:47
  local time: Wed Sep 30 13:44:42 UTC 2026
  network time: Wed, 30 Sep 2026 13:44:42 GMT
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"