Harmonize with upstream

Dajamante · Dajamante · commit ff25b24a10ff · 2024-06-14T11:08:28.000+02:00
added dead_code lint while this needs fix: rust-lang/libc#3740
diff --git a/ferrocene/library/libc/src/lib.rs b/ferrocene/library/libc/src/lib.rs
@@ -13,6 +13,7 @@
     unused_macros,
     unused_macro_rules,
     // Ferrocene-specific:
+    dead_code,
     elided_lifetimes_in_paths,
     hidden_glob_reexports,
     ambiguous_glob_reexports
diff --git a/src/bootstrap/download-ci-llvm-stamp b/src/bootstrap/download-ci-llvm-stamp
@@ -1,13 +1,9 @@
 Change this file to make users of the `download-ci-llvm` configuration download
 a new version of LLVM from CI, even if the LLVM submodule hasn’t changed.
 
-<<<<<<< HEAD
-Last change is for: https://github.com/rust-lang/rust/pull/120761
+Last change is for: https://github.com/rust-lang/rust/pull/125141
 
 
 (white space intentional to avoid merge conflicts)
 
 Last Ferrocene change is for: https://github.com/ferrocene/ferrocene/pull/98
-=======
-Last change is for: https://github.com/rust-lang/rust/pull/125141
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
@@ -2240,23 +2240,15 @@ impl Config {
     /// Return the version it would have used for the given commit.
     pub(crate) fn artifact_version_part(&self, commit: &str) -> String {
         let (channel, version) = if self.rust_info.is_managed_git_subrepository() {
-<<<<<<< HEAD
-            let mut channel = self.git();
-            channel.arg("show").arg(format!("{commit}:ferrocene/ci/channel"));
-            let channel = output(&mut channel);
-            let mut version = self.git();
-            version.arg("show").arg(format!("{commit}:ferrocene/version"));
-            let version = output(&mut version);
-            (channel.trim().to_owned(), version.trim().to_owned())
-=======
             let channel = self
-                .read_file_by_commit(&PathBuf::from("src/ci/channel"), commit)
+                .read_file_by_commit(&PathBuf::from("ferrocene/ci/channel"), commit)
+                .trim()
+                .to_owned();
+            let version = self
+                .read_file_by_commit(&PathBuf::from("ferrocene/version"), commit)
                 .trim()
                 .to_owned();
-            let version =
-                self.read_file_by_commit(&PathBuf::from("src/version"), commit).trim().to_owned();
             (channel, version)
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
         } else {
             let channel = fs::read_to_string(self.src.join("ferrocene/ci/channel"));
             let version = fs::read_to_string(self.src.join("ferrocene/version"));
diff --git a/src/doc/rustc/src/platform-support.md b/src/doc/rustc/src/platform-support.md
@@ -384,12 +384,9 @@ target | std | host | notes
 `x86_64-wrs-vxworks` | ? |  |
 [`x86_64h-apple-darwin`](platform-support/x86_64h-apple-darwin.md) | ✓ | ✓ | macOS with late-gen Intel (at least Haswell)
 [`x86_64-unknown-linux-none`](platform-support/x86_64-unknown-linux-none.md) | * |  | 64-bit Linux with no libc
-<<<<<<< HEAD
-`aarch64-unknown-ferrocenecoretest` | ✓ | ✓ | Internal target for tests
-=======
 `xtensa-esp32-none-elf` |  |  | Xtensa ESP32
 `xtensa-esp32s2-none-elf` |  |  | Xtensa ESP32-S2
 `xtensa-esp32s3-none-elf` |  |  | Xtensa ESP32-S3
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
+`aarch64-unknown-ferrocenecoretest` | ✓ | ✓ | Internal target for tests
 
 [runs on NVIDIA GPUs]: https://github.com/japaric-archived/nvptx#targets
diff --git a/src/stage0 b/src/stage0
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
@@ -28,13 +28,8 @@ const LICENSES: &[&str] = &[
     "MIT OR Zlib OR Apache-2.0",                           // miniz_oxide
     "MIT",
     "MIT/Apache-2.0",
-<<<<<<< HEAD
-    "Unicode-3.0",                                         // ICU4X_UNICODE
-    "Unicode-DFS-2016",                                    // tinystr and icu4x
-=======
     "Unicode-3.0",                                         // icu4x
     "Unicode-DFS-2016",                                    // tinystr
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
     "Unlicense OR MIT",
     "Unlicense/MIT",
     "Zlib OR Apache-2.0 OR MIT",                           // tinyvec
@@ -684,17 +679,10 @@ fn check_license_exceptions(metadata: &Metadata, exceptions: &[(&str, &str)], ba
         let license = match &pkg.license {
             Some(license) => license,
             None => {
-<<<<<<< HEAD
                 if pkg.name == "ring" {
                     // *ring* does not define proper licensing metadata.
                     continue;
                 }
-                if ICU4X_UNICODE_LICENSE_DEPENDENCIES.contains(&pkg.name.as_str()) {
-                    // See the comment on ICU4X_UNICODE_LICENSE_DEPENDENCIES.
-                    continue;
-                }
-=======
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
                 tidy_error!(bad, "dependency `{}` does not define a license expression", pkg.id);
                 continue;
             }
diff --git a/tests/assembly/targets/targets-elf.rs b/tests/assembly/targets/targets-elf.rs
@@ -573,18 +573,6 @@
 //@ revisions: x86_64_wrs_vxworks
 //@ [x86_64_wrs_vxworks] compile-flags: --target x86_64-wrs-vxworks
 //@ [x86_64_wrs_vxworks] needs-llvm-components: x86
-<<<<<<< HEAD
-
-// Ferrocene-specific targets
-
-//@ revisions: i386_lynx_lynxos178
-//@ [i386_lynx_lynxos178] compile-flags: --target i386-lynx-lynxos178
-//@ [i386_lynx_lynxos178] needs-llvm-components: x86
-//@ revisions: aarch64_unknown_ferrocenecoretest
-//@ [aarch64_unknown_ferrocenecoretest] compile-flags: --target aarch64-unknown-ferrocenecoretest
-//@ [aarch64_unknown_ferrocenecoretest] needs-llvm-components: aarch64
-
-=======
 // FIXME: disabled since it requires a custom LLVM until the upstream LLVM adds support for the target (https://github.com/espressif/llvm-project/issues/4)
 /*
     revisions: xtensa_esp32_none_elf
@@ -597,7 +585,16 @@
     [xtensa_esp32s3_none_elf] compile-flags: --target xtensa-esp32s3-none-elf
     [xtensa_esp32s3_none_elf] needs-llvm-components: xtensa
 */
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
+
+// Ferrocene-specific targets
+
+//@ revisions: i386_lynx_lynxos178
+//@ [i386_lynx_lynxos178] compile-flags: --target i386-lynx-lynxos178
+//@ [i386_lynx_lynxos178] needs-llvm-components: x86
+//@ revisions: aarch64_unknown_ferrocenecoretest
+//@ [aarch64_unknown_ferrocenecoretest] compile-flags: --target aarch64-unknown-ferrocenecoretest
+//@ [aarch64_unknown_ferrocenecoretest] needs-llvm-components: aarch64
+
 // Sanity-check that each target can produce assembly code.
 
 #![feature(no_core, lang_items)]
diff --git a/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff b/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff
@@ -8,19 +8,11 @@
       let mut _3: !;
   
 +     coverage ExpressionId(0) => Expression { lhs: Counter(0), op: Add, rhs: Counter(1) };
-<<<<<<< HEAD
 +     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:11:1 - 11:11;
-+     coverage Code(Expression(0)) => $DIR/instrument_coverage.rs:12:5 - 13:17;
++     coverage Code(Expression(0)) => $DIR/instrument_coverage.rs:13:12 - 13:17;
 +     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:14:13 - 14:18;
 +     coverage Code(Counter(1)) => $DIR/instrument_coverage.rs:15:10 - 15:11;
 +     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:17:1 - 17:2;
-=======
-+     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:10:1 - 10:11;
-+     coverage Code(Expression(0)) => $DIR/instrument_coverage.rs:12:12 - 12:17;
-+     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:13:13 - 13:18;
-+     coverage Code(Counter(1)) => $DIR/instrument_coverage.rs:14:10 - 14:11;
-+     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:16:1 - 16:2;
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
 + 
       bb0: {
 +         Coverage::CounterIncrement(0);
diff --git a/tests/run-make/pgo-branch-weights/Makefile b/tests/run-make/pgo-branch-weights/Makefile
diff --git a/tests/run-make/pgo-branch-weights/rmake.rs b/tests/run-make/pgo-branch-weights/rmake.rs
@@ -43,3 +43,6 @@ fn main() {
         .stdin(fs_wrapper::read("interesting.ll"))
         .run();
 }
+
+// ferrocene-annotations: um_rustc_C_link_args
+// ferrocene-annotations: um_rustc_C_codegen_units
diff --git a/tests/run-make/prefer-dylib/Makefile b/tests/run-make/prefer-dylib/Makefile
diff --git a/tests/run-make/prefer-dylib/rmake.rs b/tests/run-make/prefer-dylib/rmake.rs
@@ -12,3 +12,5 @@ fn main() {
     // This time the command should fail.
     run_fail("foo");
 }
+
+// ferrocene-annotations: um_rustc_C_prefer_dynamic
diff --git a/tests/ui/ferrocene/compiler-arguments/emit/emit_with-output-filename.stderr b/tests/ui/ferrocene/compiler-arguments/emit/emit_with-output-filename.stderr
@@ -1,6 +1,4 @@
 warning: due to multiple output types requested, the explicitly specified output file name will be adapted for each output type
 
-warning: ignoring --out-dir flag due to -o flag
-
-warning: 2 warnings emitted
+warning: 1 warning emitted
 
diff --git a/tests/ui/ferrocene/compiler-arguments/o/o_o.stderr b/tests/ui/ferrocene/compiler-arguments/o/o_o.stderr
diff --git a/tests/ui/ferrocene/compiler-arguments/o/o_space-delim.stderr b/tests/ui/ferrocene/compiler-arguments/o/o_space-delim.stderr
diff --git a/tests/ui/impl-trait/equality.rs b/tests/ui/impl-trait/equality.rs
@@ -39,8 +39,8 @@ impl Leak for i32 {
     fn leak(self) -> i32 { self }
 }
 
-<<<<<<< HEAD
-fn main() {}
+fn main() {
+}
 
 // ferrocene-annotations: fls_46ork6fz5o2e
 // Implementation Coherence
@@ -56,7 +56,3 @@ fn main() {}
 //
 // ferrocene-annotations: fls_exe4zodlwfez
 // Type Unification
-=======
-fn main() {
-}
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
diff --git a/tests/ui/unused-crate-deps/deny-cmdline.rs b/tests/ui/unused-crate-deps/deny-cmdline.rs
@@ -5,10 +5,6 @@
 //@ aux-crate:bar=bar.rs
 
 fn main() {}
-<<<<<<< HEAD
-//~^ ERROR external crate `bar` unused in
+//~^ ERROR extern crate `bar` is unused in
 
 // ferrocene-annotations: um_rustc_D
-=======
-//~^ ERROR extern crate `bar` is unused in
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
diff --git a/tests/ui/unused-crate-deps/warn-cmdline-static.rs b/tests/ui/unused-crate-deps/warn-cmdline-static.rs
@@ -7,10 +7,6 @@
 //@ no-prefer-dynamic
 
 fn main() {}
-<<<<<<< HEAD
-//~^ WARNING external crate `bar` unused in
+//~^ WARNING extern crate `bar` is unused in
 
 // ferrocene-annotations: um_rustc_W
-=======
-//~^ WARNING extern crate `bar` is unused in
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
diff --git a/tests/ui/unused-crate-deps/warn-cmdline.rs b/tests/ui/unused-crate-deps/warn-cmdline.rs
@@ -6,10 +6,6 @@
 //@ aux-crate:bar=bar.rs
 
 fn main() {}
-<<<<<<< HEAD
-//~^ WARNING external crate `bar` unused in
+//~^ WARNING extern crate `bar` is unused in
 
 // ferrocene-annotations: um_rustc_W
-=======
-//~^ WARNING extern crate `bar` is unused in
->>>>>>> pull-upstream-temp--do-not-use-for-real-code

Original file line number	Diff line number	Diff line change
`@@ -43,3 +43,6 @@ fn main() {`
`43`	`43`	`.stdin(fs_wrapper::read("interesting.ll"))`
`44`	`44`	`.run();`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+// ferrocene-annotations: um_rustc_C_link_args`
	`48`	`+// ferrocene-annotations: um_rustc_C_codegen_units`