From c0bb7e584861763b7d8e1a243e238ef3a0ea9e19 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 28 Nov 2019 13:59:32 +0100 Subject: [PATCH 1/6] Ignore VSCode workspace settings --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f0e3bcac..a7afaa89 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /target -**/*.rs.bk \ No newline at end of file +**/*.rs.bk + +.vscode From fcdf3aa8d76c1af5bf2f376a1ef96233b38a2ae1 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 28 Nov 2019 14:02:08 +0100 Subject: [PATCH 2/6] Update to new lockfile format --- Cargo.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index f579ba57..9f83d50d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,4 +3,3 @@ [[package]] name = "blog_os" version = "0.1.0" - From 1c4ca04a2f236bea9e25b6382dd207771298e6b6 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 28 Nov 2019 14:03:59 +0100 Subject: [PATCH 3/6] Update post-02 to new lockfile format --- Cargo.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9599acae..a3417609 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,13 +4,11 @@ name = "blog_os" version = "0.1.0" dependencies = [ - "bootloader 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bootloader", ] [[package]] name = "bootloader" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum bootloader 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "45dd858bd74a742ec0fe887722952c263abd0825aa8d33a3704917a97d7bd41e" +checksum = "d596849a47f28abdea62d7a6a25c4f6e69c3d9b09b0a2877db6e9cda004ca993" From 748365bf625bfc985fa04070d731edd91cc56572 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 28 Nov 2019 14:04:38 +0100 Subject: [PATCH 4/6] Update post-03 to new lockfile format --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 483eef96..920ab3c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,9 +5,9 @@ name = "blog_os" version = "0.1.0" dependencies = [ "bootloader", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "spin", + "volatile", ] [[package]] @@ -15,24 +15,24 @@ name = "bootloader" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d596849a47f28abdea62d7a6a25c4f6e69c3d9b09b0a2877db6e9cda004ca993" + [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin", ] [[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "volatile" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" - -"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -"checksum volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29" +checksum = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29" From 0c3e6f95f67d6eba00bf6d87bbda0703d234cdae Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 28 Nov 2019 14:05:44 +0100 Subject: [PATCH 5/6] Update post-04 to new lockfile format --- Cargo.lock | 73 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 14e66a9d..9b0ed7d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,19 +4,22 @@ name = "array-init" version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72" dependencies = [ - "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "nodrop", ] [[package]] name = "bit_field" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56" [[package]] name = "bitflags" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blog_os" @@ -25,9 +28,9 @@ dependencies = [ "bootloader", "lazy_static", "spin", - "uart_16550 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "uart_16550", "volatile", - "x86_64 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "x86_64", ] [[package]] @@ -38,8 +41,12 @@ checksum = "d596849a47f28abdea62d7a6a25c4f6e69c3d9b09b0a2877db6e9cda004ca993" [[package]] name = "cast" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" +dependencies = [ + "rustc_version", +] [[package]] name = "lazy_static" @@ -52,8 +59,33 @@ dependencies = [ [[package]] name = "nodrop" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "spin" @@ -65,38 +97,33 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" name = "uart_16550" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803ea8cb602dbb32c1a657a866d2dd79fe7dbeab0fb2ac667cb4dcc7de12a58b" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "x86_64 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "x86_64", ] [[package]] name = "ux" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88dfeb711b61ce620c0cb6fd9f8e3e678622f0c971da2a63c4b3e25e88ed012f" [[package]] name = "volatile" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29" + [[package]] name = "x86_64" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f27d9168654aee1b0c1b73746caeb4aa33248f8b8c8f6e100e697fcc2a794b2" dependencies = [ - "array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "array-init", + "bit_field", + "bitflags", + "cast", + "ux", ] - -"checksum array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72" -"checksum bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56" -"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2" -"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" -"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" -"checksum uart_16550 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "803ea8cb602dbb32c1a657a866d2dd79fe7dbeab0fb2ac667cb4dcc7de12a58b" -"checksum ux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88dfeb711b61ce620c0cb6fd9f8e3e678622f0c971da2a63c4b3e25e88ed012f" -"checksum x86_64 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "997837f3913aac8f67164683258756d712376849906c8d609f844084bc03ef84" From d4c256c6536e7f64b5945be255841578900b7a5f Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 28 Nov 2019 14:07:23 +0100 Subject: [PATCH 6/6] Update post-07 to new lockfile format --- Cargo.lock | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f9b738d9..1c5f1a62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,8 +27,8 @@ version = "0.1.0" dependencies = [ "bootloader", "lazy_static", - "pc-keyboard 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pic8259_simple 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pc-keyboard", + "pic8259_simple", "spin", "uart_16550", "volatile", @@ -54,6 +54,7 @@ dependencies = [ name = "cpuio" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22b8e308ccfc5acf3b82f79c0eac444cf6114cb2ac67a230ca6c177210068daa" [[package]] name = "lazy_static" @@ -70,6 +71,21 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +[[package]] +name = "pc-keyboard" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff50ab09ba31bcebc0669f4e64c0952fae1acdca9e6e0587e68e4e8443808ac" + +[[package]] +name = "pic8259_simple" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc64b2fd10828da8521b6cdabe0679385d7d2a3a6d4c336b819d1fa31ba35c72" +dependencies = [ + "cpuio", +] + [[package]] name = "rustc_version" version = "0.2.3" @@ -94,19 +110,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "pc-keyboard" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "pic8259_simple" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cpuio 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "spin" version = "0.5.2" @@ -147,7 +150,3 @@ dependencies = [ "cast", "ux", ] - -"checksum cpuio 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "22b8e308ccfc5acf3b82f79c0eac444cf6114cb2ac67a230ca6c177210068daa" -"checksum pc-keyboard 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fff50ab09ba31bcebc0669f4e64c0952fae1acdca9e6e0587e68e4e8443808ac" -"checksum pic8259_simple 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc64b2fd10828da8521b6cdabe0679385d7d2a3a6d4c336b819d1fa31ba35c72" \ No newline at end of file