Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 452cf4f

Browse files
committedNov 5, 2022
Auto merge of #103998 - Dylan-DPC:rollup-2nbmtc9, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #103621 (Correctly resolve Inherent Associated Types) - #103660 (improve `filesearch::get_or_default_sysroot`) - #103866 (Remove some return-type diagnostic booleans from `FnCtxt`) - #103867 (Remove `has_errors` from `FnCtxt`) - #103994 (Specify that `break` cannot be used outside of loop *or* labeled block) - #103995 (Small round of typo fixes) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5b3e909 + 47e6304 commit 452cf4f

File tree

52 files changed

+300
-412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+300
-412
lines changed
 

‎Cargo.lock

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3672,7 +3672,6 @@ dependencies = [
36723672
name = "rustc_interface"
36733673
version = "0.0.0"
36743674
dependencies = [
3675-
"libc",
36763675
"libloading",
36773676
"rustc-rayon",
36783677
"rustc-rayon-core",
@@ -3715,7 +3714,6 @@ dependencies = [
37153714
"rustc_ty_utils",
37163715
"smallvec",
37173716
"tracing",
3718-
"winapi",
37193717
]
37203718

37213719
[[package]]
@@ -4135,6 +4133,7 @@ name = "rustc_session"
41354133
version = "0.0.0"
41364134
dependencies = [
41374135
"getopts",
4136+
"libc",
41384137
"rustc_ast",
41394138
"rustc_data_structures",
41404139
"rustc_errors",
@@ -4146,7 +4145,9 @@ dependencies = [
41464145
"rustc_serialize",
41474146
"rustc_span",
41484147
"rustc_target",
4148+
"smallvec",
41494149
"tracing",
4150+
"winapi",
41504151
]
41514152

41524153
[[package]]

‎compiler/rustc_codegen_ssa/src/back/link.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,8 @@ fn link_sanitizer_runtime(sess: &Session, linker: &mut dyn Linker, name: &str) {
11231123
if path.exists() {
11241124
return session_tlib;
11251125
} else {
1126-
let default_sysroot = filesearch::get_or_default_sysroot();
1126+
let default_sysroot =
1127+
filesearch::get_or_default_sysroot().expect("Failed finding sysroot");
11271128
let default_tlib = filesearch::make_target_lib_path(
11281129
&default_sysroot,
11291130
sess.opts.target_triple.triple(),

0 commit comments

Comments
 (0)
Please sign in to comment.