Auto merge of #146687 - lambdageek:revert-rc-for-beta, r=jieyouxu

[beta] Revert "compiler: Add Windows resources to rustc-main and rustc_driver"

This reverts #146018 due to #146693

Author: bors

Cargo.lock

@@ -3275,7 +3275,6 @@ dependencies = [
  "rustc_driver_impl",
  "rustc_public",
  "rustc_public_bridge",
- "rustc_windows_rc",
  "tikv-jemalloc-sys",
 ]
 
@@ -3651,7 +3650,6 @@ name = "rustc_driver"
 version = "0.0.0"
 dependencies = [
  "rustc_driver_impl",
- "rustc_windows_rc",
 ]
 
 [[package]]
@@ -4748,13 +4746,6 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "rustc_windows_rc"
-version = "0.0.0"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "rustdoc"
 version = "0.0.0"

compiler/rustc/Cargo.toml

@@ -33,8 +33,3 @@ llvm = ['rustc_driver_impl/llvm']
 max_level_info = ['rustc_driver_impl/max_level_info']
 rustc_randomized_layouts = ['rustc_driver_impl/rustc_randomized_layouts']
 # tidy-alphabetical-end
-
-[build-dependencies]
-# tidy-alphabetical-start
-rustc_windows_rc = { path = "../rustc_windows_rc" }
-# tidy-alphabetical-end

compiler/rustc/build.rs

@@ -1,6 +1,4 @@
-use std::{env, path};
-
-use rustc_windows_rc::{VersionInfoFileType, compile_windows_resource_file};
+use std::env;
 
 fn main() {
     let target_os = env::var("CARGO_CFG_TARGET_OS");
@@ -15,18 +13,6 @@ fn main() {
 
 // Add a manifest file to rustc.exe.
 fn set_windows_exe_options() {
-    set_windows_resource();
-    set_windows_manifest();
-}
-
-fn set_windows_resource() {
-    let stem = path::PathBuf::from("rustc_main_resource");
-    let file_description = "rustc";
-    let res_file = compile_windows_resource_file(&stem, file_description, VersionInfoFileType::App);
-    println!("cargo:rustc-link-arg={}", res_file.display());
-}
-
-fn set_windows_manifest() {
     static WINDOWS_MANIFEST_FILE: &str = "Windows Manifest.xml";
 
     let mut manifest = env::current_dir().unwrap();

compiler/rustc_codegen_ssa/Cargo.toml

@@ -9,7 +9,7 @@ ar_archive_writer = "0.5"
 bitflags = "2.4.1"
 bstr = "1.11.3"
 # `cc` updates often break things, so we pin it here. Cargo enforces "max 1 semver-compat version
-# per crate", so if you change this, you need to also change it in `rustc_llvm` and `rustc_windows_rc`.
+# per crate", so if you change this, you need to also change it in `rustc_llvm`.
 cc = "=1.2.16"
 itertools = "0.12"
 pathdiff = "0.2.0"

compiler/rustc_driver/Cargo.toml

@@ -10,8 +10,3 @@ crate-type = ["dylib"]
 # tidy-alphabetical-start
 rustc_driver_impl = { path = "../rustc_driver_impl" }
 # tidy-alphabetical-end
-
-[build-dependencies]
-# tidy-alphabetical-start
-rustc_windows_rc = { path = "../rustc_windows_rc" }
-# tidy-alphabetical-end

compiler/rustc_driver/build.rs

@@ -11,7 +11,7 @@ libc = "0.2.73"
 [build-dependencies]
 # tidy-alphabetical-start
 # `cc` updates often break things, so we pin it here. Cargo enforces "max 1 semver-compat version
-# per crate", so if you change this, you need to also change it in `rustc_codegen_ssa` and `rustc_windows_rc`.
+# per crate", so if you change this, you need to also change it in `rustc_codegen_ssa`.
 cc = "=1.2.16"
 # tidy-alphabetical-end