Skip to content

Commit 13aea60

Browse files
bors[bot]mkroening
andauthored
Merge #413
413: Don't export __rg_oom r=mkroening a=mkroening Depends on rust-lang/rust#95365. Co-authored-by: Martin Kröning <[email protected]>
2 parents 157ea68 + a33ade6 commit 13aea60

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[toolchain]
22
# Manually sync this with Dockerfile!
3-
channel = "nightly-2022-04-24"
3+
channel = "nightly-2022-05-15"
44
components = [
55
"clippy",
66
"llvm-tools-preview",

src/macros.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ macro_rules! try_sys {
8181
/// // instead of
8282
/// let ret = f(arg);
8383
/// ```
84+
#[allow(unused_macro_rules)]
8485
macro_rules! kernel_function {
8586
($f:ident()) => {
8687
$crate::arch::switch::kernel_function0($f)

xtask/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ impl flags::Build {
138138
let explicit_exports = [
139139
"_start",
140140
"__bss_start",
141-
"__rg_oom",
142141
"runtime_entry",
143142
// lwIP functions (C runtime)
144143
"init_lwip",

0 commit comments

Comments
 (0)