From 1cdc0104465cc90114b56baf44cf4f91b2fd2078 Mon Sep 17 00:00:00 2001 From: Toothbrush Date: Tue, 20 Feb 2018 21:10:05 +0000 Subject: [PATCH] Fix: Change `"panic"` to `"panic-strategy"` (#392) --- .../second-edition/posts/02-minimal-rust-kernel/index.md | 4 ++-- x86_64-blog_os.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md b/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md index ff88c711..0b06513a 100644 --- a/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md +++ b/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md @@ -143,7 +143,7 @@ Instead of using the platform's default linker (which might not support Linux ta [LLD]: https://lld.llvm.org/ ```json -"panic": "abort", +"panic-strategy": "abort", ``` This setting specifies that the target doesn't support [stack unwinding] on panic, so instead the program should abort directly. This has the same effect as the `panic = "abort"` option in our Cargo.toml, so we can remove it from there. @@ -189,7 +189,7 @@ Our target specification file now looks like this: "executables": true, "features": "-mmx,-sse,+soft-float", "disable-redzone": true, - "panic": "abort" + "panic-strategy": "abort" } ``` diff --git a/x86_64-blog_os.json b/x86_64-blog_os.json index 26cc0642..c8c39b29 100644 --- a/x86_64-blog_os.json +++ b/x86_64-blog_os.json @@ -11,5 +11,5 @@ "executables": true, "features": "-mmx,-sse,+soft-float", "disable-redzone": true, - "panic": "abort" + "panic-strategy": "abort" }