Bump default version of rustc. (#3562)

Closes #3627

Author: UebelAndre

.bazelci/presubmit.yml

@@ -569,18 +569,6 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
-  cc_common_link_and_mangling_ubuntu2204:
-    name: Build via cc_common.link with rustc mangling alloc symbols
-    platform: ubuntu2204
-    working_directory: test/integration/cc_common_link
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
-    build_flags:
-      - "--config=mangled_alloc_symbols"
-    test_flags:
-      - "--config=mangled_alloc_symbols"
   cc_common_link_with_global_alloc_ubuntu2204:
     name: Build via cc_common.link using a global allocator
     platform: ubuntu2204
@@ -597,18 +585,6 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
-  cc_common_link_with_global_alloc_and_mangling_ubuntu2204:
-    name: Build via cc_common.link using a global allocator with rustc mangling alloc symbols
-    platform: ubuntu2204
-    working_directory: test/integration/cc_common_link_with_global_alloc
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
-    build_flags:
-      - "--config=mangled_alloc_symbols"
-    test_flags:
-      - "--config=mangled_alloc_symbols"
   cc_common_link_no_std_ubuntu2204:
     name: Build with no_std + alloc using cc_common.link infrastructure for linking
     platform: ubuntu2204
@@ -621,18 +597,6 @@ tasks:
       - "--config=no_std_alloc_using_cc_common_link"
     test_flags:
       - "--config=no_std_alloc_using_cc_common_link"
-  cc_common_link_no_std_and_mangling_ubuntu2204:
-    name: Build with no_std + alloc using cc_common.link infrastructure for linking with rust toolchain mangling alloc symbols
-    platform: ubuntu2204
-    working_directory: test/integration/no_std
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
-    build_flags:
-      - "--config=no_std_alloc_using_cc_common_link_and_mangled_alloc_symbols"
-    test_flags:
-      - "--config=no_std_alloc_using_cc_common_link_and_mangled_alloc_symbols"
   no_std_ubuntu2204:
     name: Build with no_std + alloc
     platform: ubuntu2204

MODULE.bazel

@@ -76,7 +76,7 @@ use_repo(
     "rules_rust_toolchain_test_target_json",
 )
 
-bazel_dep(name = "rules_python", version = "0.40.0", dev_dependency = True)
+bazel_dep(name = "rules_python", version = "1.5.1", dev_dependency = True)
 bazel_dep(name = "rules_testing", version = "0.7.0", dev_dependency = True)
 bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
 

crate_universe/src/cli/splice.rs

@@ -108,9 +108,12 @@ pub fn splice(opt: SpliceOptions) -> Result<()> {
         .with_context(|| format!("Failed to splice workspace {}", opt.repository_name))?;
 
     // Use the existing lockfile if possible, otherwise generate a new one.
-    let cargo_lockfile = if opt.cargo_lockfile.is_some() && opt.skip_cargo_lockfile_overwrite {
-        let cargo_lockfile_path = opt.cargo_lockfile.unwrap();
-        cargo_lock::Lockfile::load(&cargo_lockfile_path).context(format!(
+    let cargo_lockfile = if let Some(cargo_lockfile_path) = opt
+        .cargo_lockfile
+        .as_ref()
+        .filter(|_| opt.skip_cargo_lockfile_overwrite)
+    {
+        cargo_lock::Lockfile::load(cargo_lockfile_path).context(format!(
             "Failed to load lockfile: {}",
             cargo_lockfile_path.display()
         ))?

crate_universe/src/metadata/metadata_annotation.rs

@@ -568,7 +568,7 @@ mod test {
         let pkg = mock_cargo_metadata_package();
         let lock_pkg = mock_cargo_lock_package();
 
-        assert!(cargo_meta_pkg_to_locked_pkg(&pkg, &vec![lock_pkg]).is_some())
+        assert!(cargo_meta_pkg_to_locked_pkg(&pkg, &[lock_pkg]).is_some())
     }
 
     #[test]

crate_universe/src/utils/starlark/select_scalar.rs

@@ -112,8 +112,12 @@ where
         //         },
         //     })
 
-        if self.common.is_some() && self.selects.is_empty() && self.unmapped.is_empty() {
-            return self.common.as_ref().unwrap().serialize(serializer);
+        if let Some(common) = self
+            .common
+            .as_ref()
+            .filter(|_| self.selects.is_empty() && self.unmapped.is_empty())
+        {
+            return common.serialize(serializer);
         }
 
         struct SelectInner<'a, T>(&'a SelectScalar<T>)

crate_universe/tests/cargo_integration_test.rs

@@ -7,7 +7,7 @@ extern crate tempfile;
 use std::collections::HashMap;
 use std::env;
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use anyhow::{ensure, Context, Result};
 use camino::Utf8PathBuf;
@@ -44,10 +44,10 @@ fn setup_cargo_env(rfiles: &runfiles::Runfiles) -> Result<(PathBuf, PathBuf)> {
     // If $RUSTC is a relative path it can cause issues with
     // `cargo_metadata::MetadataCommand`. Just to be on the safe side, we make
     // both of these env variables absolute paths.
-    if cargo != PathBuf::from(env::var("CARGO").unwrap()) {
+    if cargo != Path::new(&env::var("CARGO").unwrap()) {
         env::set_var("CARGO", cargo.as_os_str());
     }
-    if rustc != PathBuf::from(env::var("RUSTC").unwrap()) {
+    if rustc != Path::new(&env::var("RUSTC").unwrap()) {
         env::set_var("RUSTC", rustc.as_os_str());
     }
 

examples/android/.bazelrc

@@ -20,6 +20,8 @@ coverage --experimental_fetch_all_coverage_outputs
 # https://bazel.build/reference/command-line-reference#flag--experimental_cc_shared_library
 common --experimental_cc_shared_library
 
+build --@rules_rust//rust/settings:experimental_use_allocator_libraries_with_mangled_symbols=True
+
 ###############################################################################
 ## Unique configuration groups
 ###############################################################################

examples/crate_universe/MODULE.bazel

@@ -645,7 +645,7 @@ use_repo(
     "crates_vendor_pkgs__tracing-subscriber-0.3.19",
     "cvm",
     "cvm__serde_yaml-0.9.34-deprecated",
-    "cvm__tempfile-3.25.0",
+    "cvm__tempfile-3.26.0",
     "cvm__tokio-1.49.0",
     "cvm__tokio-test-0.4.5",
 )

examples/crate_universe/alias_rule/cargo-bazel-lock_global_alias_annotation_none.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "7080bcc8dbd2cfc5533bea104d6f394bf67ff851796be8675f0abd0cee55319a",
+  "checksum": "e964fe843eb5aa86b5ef42ce8d1035757ce2de11087baf339a3bfcfcc06f0530",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",

examples/crate_universe/alias_rule/cargo-bazel-lock_global_alias_annotation_opt.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "c10fbbbe14bd280297ec9109bc58da5486d585fe108f87ae19bf140362644628",
+  "checksum": "5ad103f54649a23546f68547eb70c55c202bdddc0a2bc1452c8ca512b9694578",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",