Merge branch 'post-02' into post-03

# Conflicts: # Cargo.lock
Run cargo update for bootloader crate
2025-12-16 22:37:49 +00:00 · 2022-01-18 10:06:27 +01:00 · 2022-01-18 10:05:56 +01:00 · 2021-12-22 09:27:26 +01:00 · 2021-12-22 09:27:00 +01:00 · 2021-05-21 19:54:20 +02:00
6 changed files with 11 additions and 16 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,6 @@
 [unstable]
 build-std = ["core", "compiler_builtins"]
+build-std-features = ["compiler-builtins-mem"]

 [build]
 target = "x86_64-blog_os.json"
--- a/.github/workflows/build-code.yml
+++ b/.github/workflows/build-code.yml
@@ -1,4 +1,4 @@
-name: Build Code
+name: Code

 on:
  push:
@@ -16,6 +16,7 @@ jobs:
  check:
    name: Check
    strategy:
+      fail-fast: false
      matrix:
        platform: [
          ubuntu-latest,
@@ -41,6 +42,7 @@ jobs:
  test:
    name: Test
    strategy:
+      fail-fast: false
      matrix:
        platform: [
          ubuntu-latest,
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,21 +1,22 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "blog_os"
 version = "0.1.0"
 dependencies = [
 "bootloader",
 "lazy_static",
- "rlibc",
 "spin",
 "volatile",
 ]

 [[package]]
 name = "bootloader"
-version = "0.9.8"
+version = "0.9.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad686b9b47363de7d36c05fb6885f17d08d0f2d15b1bc782a101fe3c94a2c7c"
+checksum = "a62c8f6168cd106687ee36a2b71a46c4144d73399f72814104d33094b8092fd2"

 [[package]]
 name = "lazy_static"
@@ -26,12 +27,6 @@ dependencies = [
 "spin",
 ]

-[[package]]
-name = "rlibc"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -40,6 +35,6 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
 name = "volatile"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29"
+checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2018"

 [dependencies]
 bootloader = "0.9.8"
-rlibc = "1.0.0"
 volatile = "0.2.6"
 spin = "0.5.2"

--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Blog OS (VGA Text Mode)

-[![Build Status](https://github.com/phil-opp/blog_os/workflows/Build%20Code/badge.svg?branch=post-03)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Build+Code%22+branch%3Apost-03)
+[![Build Status](https://github.com/phil-opp/blog_os/workflows/Code/badge.svg?branch=post-03)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Code%22+branch%3Apost-03)

 This repository contains the source code for the [VGA Text Mode][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.

--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,6 @@
 #![no_std]
 #![no_main]

-extern crate rlibc;
-
 use core::panic::PanicInfo;

 mod vga_buffer;
Author	SHA1	Message	Date
Philipp Oppermann	a387a00c85	Merge branch 'post-02' into post-03 # Conflicts: # Cargo.lock	2022-01-18 10:06:27 +01:00
Philipp Oppermann	faa8d15cb7	Run cargo update for bootloader crate	2022-01-18 10:05:56 +01:00
Philipp Oppermann	4c9cd3ae32	Merge branch 'post-02' into post-03	2021-12-22 09:27:26 +01:00
Philipp Oppermann	26f1f5b896	Run cargo update for bootloader crate	2021-12-22 09:27:00 +01:00
Philipp Oppermann	cbead25b43	Merge branch 'post-02' into post-03	2021-05-21 19:54:20 +02:00
Philipp Oppermann	1f49e2e9fe	Merge branch 'post-01' into post-02	2021-05-21 19:53:49 +02:00
Philipp Oppermann	8708b54756	Readme: Update workflow name in badge	2021-05-21 19:53:01 +02:00
Philipp Oppermann	2c25d55810	Merge branch 'post-02' into post-03	2021-05-20 14:32:42 +02:00
Philipp Oppermann	021762cf30	Run `cargo update` for bootloader	2021-05-20 14:32:27 +02:00
Philipp Oppermann	ec95ac0e5a	Merge branch 'post-02' into post-03	2021-05-17 11:29:14 +02:00
Philipp Oppermann	d8f280315f	Run cargo update for bootloader crate	2021-05-17 11:28:54 +02:00
Philipp Oppermann	e39c7d8ad8	Merge branch 'post-02' into post-03	2021-03-10 09:23:02 +01:00
Philipp Oppermann	066c278277	Merge branch 'post-01' into post-02	2021-03-10 09:23:02 +01:00
Philipp Oppermann	bdb6a424a8	CI: Rename 'Build Code' workflow to 'Code'	2021-03-10 09:22:57 +01:00
Philipp Oppermann	f40717901b	Merge branch 'post-02' into post-03	2021-03-10 09:15:58 +01:00
Philipp Oppermann	96844f6519	Merge branch 'post-01' into post-02	2021-03-10 09:15:58 +01:00
Philipp Oppermann	1501669819	Update lockfile format	2021-03-10 09:15:54 +01:00
Philipp Oppermann	195f4489e6	Merge branch 'post-02' into post-03	2021-03-10 09:13:39 +01:00
Philipp Oppermann	1b86d7fd62	Merge branch 'post-01' into post-02	2021-03-10 09:13:39 +01:00
Philipp Oppermann	deb0f63dff	Ci: Don't fail fast	2021-03-10 09:13:00 +01:00
Philipp Oppermann	fbdcd45d16	Merge branch 'post-02' into post-03	2021-03-10 08:53:37 +01:00
Philipp Oppermann	d658949f5b	Run cargo update for bootloader crate	2021-03-10 08:53:21 +01:00
Philipp Oppermann	d12842bcd5	Merge branch 'post-02' into post-03	2021-02-02 10:52:00 +01:00
Philipp Oppermann	0e52ccbebb	Run cargo update for bootloader crate	2021-02-02 10:51:03 +01:00
Philipp Oppermann	ea5aad0e0c	Merge branch 'post-02' into post-03	2020-10-02 23:17:08 +02:00
Rob Gries	4e38e7ddf8	Remove rlibc and use compiler-builtins-mem feature (#865 )	2020-10-02 23:14:25 +02:00
Philipp Oppermann	1afa3af79d	Merge branch 'post-02' into post-03	2020-09-29 12:19:54 +02:00
Philipp Oppermann	49dce7ada7	`cargo update` the `bootloader`crate to fix nightly breakage	2020-09-29 12:19:48 +02:00
Philipp Oppermann	552eb97f75	Merge branch 'post-02' into post-03	2020-09-24 10:10:16 +02:00
Philipp Oppermann	c42cee8d89	Update bootloader to 0.9.10	2020-09-24 10:09:57 +02:00
Philipp Oppermann	eace075f2c	Run cargo update for post-03	2020-09-24 09:08:28 +02:00
Philipp Oppermann	2d5150f2a3	Merge branch 'post-02' into post-03	2020-09-24 09:08:11 +02:00
Philipp Oppermann	ebb9f0b8a7	Run cargo update	2020-09-24 09:07:45 +02:00