Closed github-actions[bot] closed 11 months ago
The automation failed to pull the latest changes from upstream againdue to the following merge conflict:
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 failed to pull the latest changes from upstream againdue to the following merge conflict:
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/did_you_mean/issue-93210-ignore-doc-hidden.rs
* 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 failed to pull the latest changes from upstream againdue to the following merge conflict:
diff --cc Cargo.lock
index 977ef880b23,082bb4be93c..00000000000
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -3293,10 -2692,10 +3354,17 @@@ dependencies =
]
[[package]]
++<<<<<<< HEAD
+name = "outref"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
++=======
+ name = "option-ext"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
[[package]]
name = "overload"
@@@ -3612,12 -2971,27 +3691,36 @@@ dependencies =
]
[[package]]
++<<<<<<< HEAD
+name = "primeorder"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
+dependencies = [
+ "elliptic-curve",
++=======
+ name = "proc-macro-error"
+ version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+ dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+ ]
+
+ [[package]]
+ name = "proc-macro-error-attr"
+ version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+ dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
]
[[package]]
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;
diff --cc tests/run-make/raw-dylib-inline-cross-dylib/Makefile
index d87a5229e06,195b5fda56f..00000000000
--- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
@@@ -27,11 -27,4 +27,15 @@@ els
$(CC) "$(TMPDIR)"/extern_2.obj -shared -o "$(TMPDIR)"/extern_2.dll
endif
$(call RUN,driver) > "$(TMPDIR)"/output.txt
++<<<<<<< HEAD
+
+ifdef RUSTC_BLESS_TEST
+ cp "$(TMPDIR)"/output.txt output.txt
+else
+ $(DIFF) output.txt "$(TMPDIR)"/output.txt
+endif
+
+# ferrocene-annotations: um_rustc_C_prefer_dynamic
++=======
+ $(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
* Unmerged path tests/run-make/issue-71519/Makefile
* Unmerged path tests/ui/did_you_mean/issue-93210-ignore-doc-hidden.rs
* 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 failed to pull the latest changes from upstream againdue to the following merge conflict:
diff --cc Cargo.lock
index 3eec5268dec,082bb4be93c..00000000000
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -3303,10 -2692,10 +3354,17 @@@ dependencies =
]
[[package]]
++<<<<<<< HEAD
+name = "outref"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
++=======
+ name = "option-ext"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
[[package]]
name = "overload"
@@@ -3622,12 -2971,27 +3691,36 @@@ dependencies =
]
[[package]]
++<<<<<<< HEAD
+name = "primeorder"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
+dependencies = [
+ "elliptic-curve",
++=======
+ name = "proc-macro-error"
+ version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+ dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+ ]
+
+ [[package]]
+ name = "proc-macro-error-attr"
+ version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+ dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
]
[[package]]
diff --cc tests/run-make/raw-dylib-inline-cross-dylib/Makefile
index d87a5229e06,195b5fda56f..00000000000
--- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
@@@ -27,11 -27,4 +27,15 @@@ els
$(CC) "$(TMPDIR)"/extern_2.obj -shared -o "$(TMPDIR)"/extern_2.dll
endif
$(call RUN,driver) > "$(TMPDIR)"/output.txt
++<<<<<<< HEAD
+
+ifdef RUSTC_BLESS_TEST
+ cp "$(TMPDIR)"/output.txt output.txt
+else
+ $(DIFF) output.txt "$(TMPDIR)"/output.txt
+endif
+
+# ferrocene-annotations: um_rustc_C_prefer_dynamic
++=======
+ $(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
* Unmerged path tests/run-make/issue-71519/Makefile
The automation failed to pull the latest changes from upstream againdue to the following merge conflict:
diff --cc Cargo.lock
index 3eec5268dec,2882ec0682e..00000000000
--- a/Cargo.lock
+++ b/Cargo.lock
diff --cc tests/run-make/raw-dylib-inline-cross-dylib/Makefile
index d87a5229e06,195b5fda56f..00000000000
--- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
@@@ -27,11 -27,4 +27,15 @@@ els
$(CC) "$(TMPDIR)"/extern_2.obj -shared -o "$(TMPDIR)"/extern_2.dll
endif
$(call RUN,driver) > "$(TMPDIR)"/output.txt
++<<<<<<< HEAD
+
+ifdef RUSTC_BLESS_TEST
+ cp "$(TMPDIR)"/output.txt output.txt
+else
+ $(DIFF) output.txt "$(TMPDIR)"/output.txt
+endif
+
+# ferrocene-annotations: um_rustc_C_prefer_dynamic
++=======
+ $(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
* Unmerged path tests/run-make/issue-71519/Makefile
The automation failed to pull the latest changes from upstream againdue to the following merge conflict:
diff --cc Cargo.lock
index 3eec5268dec,48d13e17d62..00000000000
--- a/Cargo.lock
+++ b/Cargo.lock
diff --cc src/bootstrap/builder.rs
index 00cef70adc4,c714b09ec3c..00000000000
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@@ -2101,11 -2068,7 +2114,15 @@@ impl<'a> Builder<'a>
cargo.env("RUSTFLAGS", &rustc_args.join(" "));
}
++<<<<<<< HEAD
+ if target.contains("ferrocenecoretest") {
+ rustflags.arg("-Zpanic-abort-tests");
+ }
+
+ Cargo { command: cargo, rustflags, rustdocflags, allow_features }
++=======
+ Cargo { command: cargo, rustflags, rustdocflags, hostflags, allow_features }
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
}
/// Ensure that a given step is built, returning its output. This will
diff --cc tests/run-make/raw-dylib-inline-cross-dylib/Makefile
index d87a5229e06,195b5fda56f..00000000000
--- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
@@@ -27,11 -27,4 +27,15 @@@ els
$(CC) "$(TMPDIR)"/extern_2.obj -shared -o "$(TMPDIR)"/extern_2.dll
endif
$(call RUN,driver) > "$(TMPDIR)"/output.txt
++<<<<<<< HEAD
+
+ifdef RUSTC_BLESS_TEST
+ cp "$(TMPDIR)"/output.txt output.txt
+else
+ $(DIFF) output.txt "$(TMPDIR)"/output.txt
+endif
+
+# ferrocene-annotations: um_rustc_C_prefer_dynamic
++=======
+ $(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
* Unmerged path tests/run-make/issue-71519/Makefile
The automation failed to pull the latest changes from upstream againdue to the following merge conflict:
diff --cc Cargo.lock
index 3eec5268dec,1f2a918d463..00000000000
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -3303,10 -2692,10 +3354,17 @@@ dependencies =
]
[[package]]
++<<<<<<< HEAD
+name = "outref"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
++=======
+ name = "option-ext"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
[[package]]
name = "overload"
@@@ -3622,12 -2971,27 +3691,36 @@@ dependencies =
]
[[package]]
++<<<<<<< HEAD
+name = "primeorder"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
+dependencies = [
+ "elliptic-curve",
++=======
+ name = "proc-macro-error"
+ version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+ dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+ ]
+
+ [[package]]
+ name = "proc-macro-error-attr"
+ version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+ dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
]
[[package]]
diff --cc src/bootstrap/builder.rs
index 00cef70adc4,c714b09ec3c..00000000000
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@@ -2101,11 -2068,7 +2114,15 @@@ impl<'a> Builder<'a>
cargo.env("RUSTFLAGS", &rustc_args.join(" "));
}
++<<<<<<< HEAD
+ if target.contains("ferrocenecoretest") {
+ rustflags.arg("-Zpanic-abort-tests");
+ }
+
+ Cargo { command: cargo, rustflags, rustdocflags, allow_features }
++=======
+ Cargo { command: cargo, rustflags, rustdocflags, hostflags, allow_features }
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
}
/// Ensure that a given step is built, returning its output. This will
diff --cc tests/run-make/raw-dylib-inline-cross-dylib/Makefile
index d87a5229e06,195b5fda56f..00000000000
--- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
@@@ -27,11 -27,4 +27,15 @@@ els
$(CC) "$(TMPDIR)"/extern_2.obj -shared -o "$(TMPDIR)"/extern_2.dll
endif
$(call RUN,driver) > "$(TMPDIR)"/output.txt
++<<<<<<< HEAD
+
+ifdef RUSTC_BLESS_TEST
+ cp "$(TMPDIR)"/output.txt output.txt
+else
+ $(DIFF) output.txt "$(TMPDIR)"/output.txt
+endif
+
+# ferrocene-annotations: um_rustc_C_prefer_dynamic
++=======
+ $(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt
++>>>>>>> pull-upstream-temp--do-not-use-for-real-code
* Unmerged path tests/run-make/issue-71519/Makefile
The automation successfully pulled the latest changes from upstream in https://github.com/ferrocene/ferrocene/pull/50! Closing this issue.
While trying to pull the latest changes from the upstream
master
branch, the automation failed due to the following merge conflict: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:
How to fix the merge conflict manually
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.