Make opts.maybe_sysroot non-optional

build_session_options always uses materialize_sysroot anyway.
2025-03-07 16:55:28 +01:00
parent 57a4736e9f
commit b54398e4ea
9 changed files with 20 additions and 14 deletions
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
@@ -1214,7 +1214,7 @@ impl Default for Options {
            describe_lints: false,
            output_types: OutputTypes(BTreeMap::new()),
            search_paths: vec![],
-            maybe_sysroot: None,
+            sysroot: filesearch::materialize_sysroot(None),
            target_triple: TargetTuple::from_tuple(host_tuple()),
            test: false,
            incremental: None,
@@ -2618,7 +2618,7 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
        describe_lints,
        output_types,
        search_paths,
-        maybe_sysroot: Some(sysroot),
+        sysroot,
        target_triple,
        test,
        incremental,