From e24ccd4ead9d90314f0c2502dd6e6036effa5394 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 27 Aug 2016 19:47:08 -0600 Subject: [PATCH 1/2] Back to x86_64, update rust --- Makefile | 2 +- rust | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 82e97b1..2a0f1d2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ARCH?=arm +ARCH?=x86_64 QEMU=qemu-system-$(ARCH) QEMUFLAGS=-serial mon:stdio -d guest_errors diff --git a/rust b/rust index b72fa8c..a23064a 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit b72fa8ca95c02e4b44b216a425fd563ad2ef58bb +Subproject commit a23064af5ec7f52b287e2c60823fed92a4763502 From a646ae4d03eb95abb880b8309192a5cfabfdd21a Mon Sep 17 00:00:00 2001 From: mus0u Date: Sun, 28 Aug 2016 16:37:40 -0500 Subject: [PATCH 2/2] fix a couple of readme typos --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a48ee82..fa50fe0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A collaborative effort to rewrite the kernel with focus on correctness and code ## Why? -The kernel code was getting increasingly messy to the point were only the original writer would be able to find and fix bugs. Fortunately, the kernel of Redox is relatively small and such a project is estimated to take only a few months. +The kernel code was getting increasingly messy to the point where only the original writer would be able to find and fix bugs. Fortunately, the kernel of Redox is relatively small and such a project is estimated to take only a few months. ## What? @@ -38,7 +38,7 @@ Abusing debug assertions is a wonderful way to catch bugs, and it is very much e Rust provides a lot of type-system features which can be used to create wonderful safe abstractions, and you should use them whenever you get the chance. -Unsafety should be avoided, and if it is triggered only under some addition **insert an assertion**. Despite this being a kernel, we prefer kernel panics over security vulnarbilities. +Unsafety should be avoided, and if it is triggered only under some addition **insert an assertion**. Despite this being a kernel, we prefer kernel panics over security vulnerabilities. If the condition is (or should be) unreachable, but if not upheld, leading to UB, put an assertion in the start of the function.