Skip to content

Commit 11d816c

Browse files
committed
Rustup to rustc 1.36.0-nightly (597f43248 2019-04-26)
1 parent 9f6a65b commit 11d816c

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

build_sysroot/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ alloc_system = { path = "./alloc_system" }
1313

1414
[patch.crates-io]
1515
rustc-std-workspace-core = { path = "./sysroot_src/src/tools/rustc-std-workspace-core" }
16+
rustc-std-workspace-alloc = { path = "./rustc-std-workspace-alloc" }
1617
compiler_builtins = { path = "./compiler_builtins" }
1718

1819
[profile.release]
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[package]
2+
name = "rustc-std-workspace-alloc"
3+
version = "1.0.0"
4+
authors = ["Alex Crichton <alex@alexcrichton.com>"]
5+
license = 'MIT/Apache-2.0'
6+
description = """
7+
Hack for the compiler's own build system
8+
"""
9+
edition = "2018"
10+
11+
[lib]
12+
path = "lib.rs"
13+
14+
[dependencies]
15+
alloc = { path = "../sysroot_src/src/liballoc" }
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#![feature(no_core)]
2+
#![no_core]
3+
#![deny(rust_2018_idioms)]
4+
5+
pub use ::alloc::*;

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,13 @@ impl CodegenBackend for CraneliftCodegenBackend {
340340
} else {
341341
None
342342
},
343-
metadata_module: CompiledModule {
343+
metadata_module: Some(CompiledModule {
344344
name: "dummy_metadata".to_string(),
345345
kind: ModuleKind::Metadata,
346346
object: None,
347347
bytecode: None,
348348
bytecode_compressed: None,
349-
},
349+
}),
350350
crate_hash: tcx.crate_hash(LOCAL_CRATE),
351351
metadata,
352352
windows_subsystem: None, // Windows is not yet supported

0 commit comments

Comments
 (0)