Skip to content

Commit e47ad58

Browse files
committed
Drop the change to resolve_crate
1 parent 1fcdd35 commit e47ad58

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

compiler/rustc_metadata/src/creader.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,8 +1195,9 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
11951195
}
11961196

11971197
// `compiler_builtins` is not yet in the graph; inject it. Error on resolution failure.
1198-
let Ok(cnum) = self.maybe_resolve_crate(
1198+
let Some(cnum) = self.resolve_crate(
11991199
sym::compiler_builtins,
1200+
krate.spans.inner_span.shrink_to_lo(),
12001201
CrateDepKind::Explicit,
12011202
CrateOrigin::Injected,
12021203
) else {

library/rustc-std-workspace-core/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
#![no_core]
33

44
pub use core::*;
5+
6+
// Crate must be brought into scope so it appears in the crate graph for anything that
7+
// depends on `rustc-std-workspace-core`.
8+
use compiler_builtins as _;

0 commit comments

Comments
 (0)