Repository diverged from upstream `master`


While trying to pull the latest changes from the upstream `master` branch, the automation failed due to the following merge conflict:

```diff
diff --cc src/bootstrap/config.rs
index 98ce4363cf4,1755c3166de..00000000000
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@@ -607,9 -583,9 +609,15 @@@ impl Merge for TomlConfig 
              rust,
              dist,
              target,
++<<<<<<< HEAD
 +            ferrocene,
 +            profile: _,
 +            changelog_seen,
++=======
+             profile: _,
+             changelog_seen,
+             change_id,
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
          }: Self,
          replace: ReplaceOpt,
      ) {
diff --cc src/doc/rustc/src/platform-support.md
index c4585bd150f,ef4eb5a1965..00000000000
--- a/src/doc/rustc/src/platform-support.md
+++ b/src/doc/rustc/src/platform-support.md
@@@ -262,21 -269,18 +269,36 @@@ target | std | host | note
  `bpfel-unknown-none` | * |  | BPF (little endian)
  `csky-unknown-linux-gnuabiv2` | ✓ |  | C-SKY abiv2 Linux(little endian)
  `hexagon-unknown-linux-musl` | ? |  |
++<<<<<<< HEAD
 +`i386-apple-ios` | ✓ |  | 32-bit x86 iOS
 +[`i386-lynx-lynxos178`](platform-support/i386-lynx-lynxos178.md) | * |  | 32-bit LynxOS-178 (2022.07)
 +[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * |  | 32-bit x86 QNX Neutrino 7.0 RTOS |
 +`i686-apple-darwin` | ✓ | ✓ | 32-bit macOS (10.12+, Sierra+)
 +`i686-pc-windows-msvc` | * |  | 32-bit Windows XP support
 +[`i686-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | ✓ |
 +`i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku
 +[`i686-unknown-hurd-gnu`](platform-support/hurd.md) | ✓ | ✓ | 32-bit GNU/Hurd
 +[`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 with SSE2
 +[`i686-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 32-bit OpenBSD
 +`i686-uwp-windows-gnu` | ? |  |
 +`i686-uwp-windows-msvc` | ? |  |
 +`i686-wrs-vxworks` | ? |  |
 +[`loongarch64-unknown-none`](platform-support/loongarch-none.md) | * |  | LoongArch64 Bare-metal (LP64D ABI)
 +[`loongarch64-unknown-none-softfloat`](platform-support/loongarch-none.md) | * |  | LoongArch64 Bare-metal (LP64S ABI)
++=======
+ `i386-apple-ios` | ✓ |  | 32-bit x86 iOS [^x86_32-floats-return-ABI]
+ [`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * |  | 32-bit x86 QNX Neutrino 7.0 RTOS  [^x86_32-floats-return-ABI]
+ `i686-apple-darwin` | ✓ | ✓ | 32-bit macOS (10.12+, Sierra+) [^x86_32-floats-return-ABI]
+ `i686-pc-windows-msvc` | * |  | 32-bit Windows XP support [^x86_32-floats-return-ABI]
+ [`i686-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | ✓ | [^x86_32-floats-return-ABI]
+ `i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku [^x86_32-floats-return-ABI]
+ [`i686-unknown-hurd-gnu`](platform-support/hurd.md) | ✓ | ✓ | 32-bit GNU/Hurd [^x86_32-floats-return-ABI]
+ [`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 with SSE2 [^x86_32-floats-return-ABI]
+ [`i686-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 32-bit OpenBSD [^x86_32-floats-return-ABI]
+ `i686-uwp-windows-gnu` | ? |  | [^x86_32-floats-return-ABI]
+ `i686-uwp-windows-msvc` | ? |  | [^x86_32-floats-return-ABI]
+ `i686-wrs-vxworks` | ? |  | [^x86_32-floats-return-ABI]
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
  [`m68k-unknown-linux-gnu`](platform-support/m68k-unknown-linux-gnu.md) | ? |  | Motorola 680x0 Linux
  `mips-unknown-linux-uclibc` | ✓ |  | MIPS Linux with uClibc
  [`mips64-openwrt-linux-musl`](platform-support/mips64-openwrt-linux-musl.md) | ? |  | MIPS64 for OpenWrt Linux MUSL
diff --cc tests/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff
index b887b74474f,28a7ffda371..00000000000
--- a/tests/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff
+++ b/tests/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff
@@@ -5,7 -5,7 +5,11 @@@
        let mut _0: bool;
    
        bb0: {
++<<<<<<< HEAD
 ++         Coverage::Counter(0) for /the/src/instrument_coverage.rs:21:1 - 23:2;
++=======
+ +         Coverage::Counter(0) for [/the/src/instrument_coverage.rs:20:1 - 22:2];
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
            _0 = const true;
            return;
        }
diff --cc tests/mir-opt/instrument_coverage.main.InstrumentCoverage.diff
index 810b4646325,9a8caa26307..00000000000
--- a/tests/mir-opt/instrument_coverage.main.InstrumentCoverage.diff
+++ b/tests/mir-opt/instrument_coverage.main.InstrumentCoverage.diff
@@@ -8,12 -8,12 +8,20 @@@
        let mut _3: !;
    
        bb0: {
++<<<<<<< HEAD
 ++         Coverage::Counter(0) for /the/src/instrument_coverage.rs:12:1 - 12:11;
++=======
+ +         Coverage::Counter(0) for [/the/src/instrument_coverage.rs:11:1 - 11:11];
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
            goto -> bb1;
        }
    
        bb1: {
++<<<<<<< HEAD
 ++         Coverage::Expression(0) = Counter(0) + Counter(1) for /the/src/instrument_coverage.rs:13:5 - 14:17;
++=======
+ +         Coverage::Expression(0) = Counter(0) + Counter(1) for [/the/src/instrument_coverage.rs:12:5 - 13:17];
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
            falseUnwind -> [real: bb2, unwind: bb6];
        }
    
@@@ -27,15 -27,14 +35,23 @@@
        }
    
        bb4: {
++<<<<<<< HEAD
 ++         Coverage::Expression(2) = Expression(1) + Zero for /the/src/instrument_coverage.rs:18:1 - 18:2;
 ++         Coverage::Expression(1) = Expression(0) - Counter(1) for /the/src/instrument_coverage.rs:15:13 - 15:18;
++=======
+ +         Coverage::Expression(1) = Expression(0) - Counter(1) for [/the/src/instrument_coverage.rs:14:13 - 14:18, /the/src/instrument_coverage.rs:17:1 - 17:2];
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
            _0 = const ();
            StorageDead(_2);
            return;
        }
    
        bb5: {
++<<<<<<< HEAD
 ++         Coverage::Counter(1) for /the/src/instrument_coverage.rs:16:10 - 16:11;
++=======
+ +         Coverage::Counter(1) for [/the/src/instrument_coverage.rs:15:10 - 15:11];
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
            _1 = const ();
            StorageDead(_2);
            goto -> bb1;
* Unmerged path tests/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
* Unmerged path tests/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
```

The automation will not open any more pull requests pulling from upstream until the merge conflict is fixed. There are multiple ways to fix the merge conflict:

* If ***all*** the conflicts should be resolved by keeping the Ferrocene changes,   [start the workflow][dispatch] with the "ours" merge strategy.
* If ***all*** the conflicts should be resolved by using the new code introduced   by Rust upstream, [start the workflow][dispatch] with the "theirs" merge   strategy.
* Otherwise, you'll have to fix the merge conflict locally (see below for   instructions).

[dispatch]: https://github.com/ferrocene/ferrocene/actions/workflows/automation-pull-upstream.yml

<details>
<summary><i>How to fix the merge conflict manually</i></summary><br>

To fix the conflict, create a new branch and execute the following command:

```
ferrocene/tools/pull-upstream/pull.sh master
```

The command will try pull the latest changes from upstream into the branch, and exit when the merge conflict is detected. Fix the merge conflict and then run:

```
git merge --continue
```

The command will finish the merge. You'll then be able to push the local branch to GitHub and open a PR for it.

</details>


Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Repository diverged from upstream `master` #15

Metadata

Assignees

Labels

Type

Fields

Projects

Milestone

Relationships

Development

Repository diverged from upstream master #15

Description

Metadata

Metadata

Assignees

Labels

Type

Fields

Projects

Milestone

Relationships

Development

Issue actions

Repository diverged from upstream `master` #15