diff --git a/Cargo.lock b/Cargo.lock index 7cefdff329..c176b72d31 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,7 +78,7 @@ dependencies = [ "memory 0.1.0", "owning_ref 0.4.0 (git+https://github.com/kevinaboos/owning-ref-rs)", "pit_clock 0.1.0", - "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "volatile 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "x86_64 0.1.2", @@ -88,7 +88,7 @@ dependencies = [ name = "app_io" version = "0.1.0" dependencies = [ - "core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)", + "core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)", "event_types 0.1.0", "keycodes_ascii 0.1.0", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -238,9 +238,9 @@ name = "cat" version = "0.1.0" dependencies = [ "app_io 0.1.0", - "core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)", + "core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)", "fs_node 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", "task 0.1.0", @@ -256,7 +256,7 @@ name = "cd" version = "0.1.0" dependencies = [ "fs_node 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", "root 0.1.0", @@ -306,8 +306,8 @@ dependencies = [ [[package]] name = "core_io" -version = "0.1.20190701" -source = "git+https://github.com/theseus-os/rust-core_io#2b21d1b6ae1cf6b015b7ffb599353335ac828a63" +version = "0.1.20191014" +source = "git+https://github.com/theseus-os/rust-core_io#05ffa7c10837fcef89395710222c7945d0309df6" dependencies = [ "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -325,7 +325,7 @@ name = "cpu" version = "0.1.0" dependencies = [ "apic 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "runqueue 0.1.0", "task 0.1.0", "terminal_print 0.1.0", @@ -369,7 +369,7 @@ name = "deps" version = "0.1.0" dependencies = [ "crate_name_utils 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "memory 0.1.0", "mod_mgmt 0.1.0", @@ -496,7 +496,7 @@ dependencies = [ "network_manager 0.1.0", "nic_buffers 0.1.0", "owning_ref 0.4.0 (git+https://github.com/kevinaboos/owning-ref-rs)", - "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp)", ] [[package]] @@ -511,7 +511,7 @@ dependencies = [ name = "example" version = "0.1.0" dependencies = [ - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "terminal_print 0.1.0", ] @@ -645,8 +645,8 @@ dependencies = [ [[package]] name = "getopts" -version = "0.2.18" -source = "git+https://github.com/kevinaboos/getopts#e593b0ed30c5500f46a00eaad7c65118a7344fa9" +version = "0.2.21" +source = "git+https://github.com/kevinaboos/getopts#da1e04828d3ecd6adc90e2da61e2e3cccc7ca97c" dependencies = [ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -732,7 +732,7 @@ dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "network_manager 0.1.0", "percent-encoding 1.0.2", - "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp)", "smoltcp_helper 0.1.0", ] @@ -746,7 +746,7 @@ name = "immediate_input_echo" version = "0.1.0" dependencies = [ "app_io 0.1.0", - "core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)", + "core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "stdio 0.1.0", ] @@ -756,7 +756,7 @@ name = "input_echo" version = "0.1.0" dependencies = [ "app_io 0.1.0", - "core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)", + "core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -871,7 +871,7 @@ name = "keyboard_echo" version = "0.1.0" dependencies = [ "app_io 0.1.0", - "core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)", + "core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)", "keycodes_ascii 0.1.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "scheduler 0.1.0", @@ -886,7 +886,7 @@ name = "kill" version = "0.1.0" dependencies = [ "debugit 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "runqueue 0.1.0", "task 0.1.0", "terminal_print 0.1.0", @@ -905,9 +905,9 @@ name = "less" version = "0.1.0" dependencies = [ "app_io 0.1.0", - "core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)", + "core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)", "fs_node 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "keycodes_ascii 0.1.0", "libterm 0.1.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -971,7 +971,7 @@ name = "ls" version = "0.1.0" dependencies = [ "fs_node 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", "task 0.1.0", @@ -1069,7 +1069,7 @@ name = "mkdir" version = "0.1.0" dependencies = [ "fs_node 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "task 0.1.0", "terminal_print 0.1.0", "vfs_node 0.1.0", @@ -1080,7 +1080,7 @@ name = "mm_eval" version = "0.1.0" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "hpet 0.1.0", "kernel_config 0.1.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1204,7 +1204,7 @@ dependencies = [ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.4.0 (git+https://github.com/kevinaboos/owning-ref-rs)", - "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp)", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1260,7 +1260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "ns" version = "0.1.0" dependencies = [ - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "memory 0.1.0", "mod_mgmt 0.1.0", "task 0.1.0", @@ -1287,7 +1287,7 @@ dependencies = [ "percent-encoding 1.0.2", "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "sha3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp)", "smoltcp_helper 0.1.0", "spawn 0.1.0", "task 0.1.0", @@ -1383,13 +1383,13 @@ name = "ping" version = "0.1.0" dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "hpet 0.1.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "network_manager 0.1.0", "ota_update_client 0.1.0", - "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp)", "smoltcp_helper 0.1.0", "terminal_print 0.1.0", "upd 0.1.0", @@ -1414,7 +1414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "pmu_sample_start" version = "0.1.0" dependencies = [ - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "pmu_x86 0.1.0", "print 0.1.0", "spawn 0.1.0", @@ -1424,7 +1424,7 @@ dependencies = [ name = "pmu_sample_stop" version = "0.1.0" dependencies = [ - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "pmu_x86 0.1.0", "print 0.1.0", ] @@ -1441,7 +1441,7 @@ dependencies = [ "memory 0.1.0", "pit_clock 0.1.0", "port_io 0.2.1", - "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "task 0.1.0", "x86_64 0.1.2", @@ -1474,7 +1474,7 @@ dependencies = [ name = "ps" version = "0.1.0" dependencies = [ - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "scheduler 0.1.0", "task 0.1.0", "terminal_print 0.1.0", @@ -1493,7 +1493,7 @@ dependencies = [ name = "pwd" version = "0.1.0" dependencies = [ - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "task 0.1.0", "terminal_print 0.1.0", ] @@ -1501,7 +1501,7 @@ dependencies = [ [[package]] name = "qp-trie" version = "0.7.3" -source = "git+https://github.com/theseus-os/qp-trie-rs#bd2b2ae37df623513ccda212af2e9a40cec8f882" +source = "git+https://github.com/theseus-os/qp-trie-rs#847923565622e909795bfc96309bc69ed4aa6689" dependencies = [ "new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1578,7 +1578,7 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "6.1.0" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1596,7 +1596,7 @@ name = "rm" version = "0.1.0" dependencies = [ "fs_node 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", "root 0.1.0", @@ -1619,7 +1619,7 @@ dependencies = [ name = "rq_eval" version = "0.1.0" dependencies = [ - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "hpet 0.1.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "runqueue 0.1.0", @@ -1825,7 +1825,7 @@ name = "shell" version = "0.1.0" dependencies = [ "app_io 0.1.0", - "core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)", + "core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)", "dfqueue 0.1.0", "environment 0.1.0", "event_types 0.1.0", @@ -1885,7 +1885,7 @@ dependencies = [ [[package]] name = "smoltcp" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/m-labs/smoltcp#0fedb1db9aa26712830822dd61f065deaa34d611" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1899,7 +1899,7 @@ dependencies = [ "hpet 0.1.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "network_manager 0.1.0", - "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp)", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1993,7 +1993,7 @@ dependencies = [ name = "stdio" version = "0.1.0" dependencies = [ - "core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)", + "core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)", "keycodes_ascii 0.1.0", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2028,7 +2028,7 @@ name = "swap" version = "0.1.0" dependencies = [ "fs_node 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "hpet 0.1.0", "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "memory 0.1.0", @@ -2222,7 +2222,7 @@ name = "upd" version = "0.1.0" dependencies = [ "fs_node 0.1.0", - "getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)", + "getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)", "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "memfs 0.1.0", "memory 0.1.0", @@ -2230,7 +2230,7 @@ dependencies = [ "network_manager 0.1.0", "ota_update_client 0.1.0", "path 0.1.0", - "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp)", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "task 0.1.0", "terminal_print 0.1.0", @@ -2343,7 +2343,7 @@ source = "git+https://github.com/kevinaboos/zero.git#9fc7ff523138a21f40359b706d2 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d" "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -"checksum core_io 0.1.20190701 (git+https://github.com/theseus-os/rust-core_io)" = "" +"checksum core_io 0.1.20191014 (git+https://github.com/theseus-os/rust-core_io)" = "" "checksum cstr_core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6ebe7158ee57e848621d24d0ed87910edb97639cb94ad9977edf440e31226035" "checksum cty 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c4e1d41c471573612df00397113557693b5bf5909666a8acb253930612b93312" "checksum derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fbe9f11be34f800b3ecaaed0ec9ec2e015d1d0ba0c8644c1310f73d6e8994615" @@ -2352,7 +2352,7 @@ source = "git+https://github.com/kevinaboos/zero.git#9fc7ff523138a21f40359b706d2 "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" "checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" "checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" -"checksum getopts 0.2.18 (git+https://github.com/kevinaboos/getopts)" = "" +"checksum getopts 0.2.21 (git+https://github.com/kevinaboos/getopts)" = "" "checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00" "checksum goblin 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c65cd533b33e3d04c6e393225fa8919ddfcf5862ca8919c7f9a167c312ef41c2" "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" @@ -2383,7 +2383,7 @@ source = "git+https://github.com/kevinaboos/zero.git#9fc7ff523138a21f40359b706d2 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" "checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" "checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3" -"checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d" +"checksum raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf" "checksum rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe" "checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" @@ -2394,7 +2394,7 @@ source = "git+https://github.com/kevinaboos/zero.git#9fc7ff523138a21f40359b706d2 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum sha3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34a5e54083ce2b934bf059fdf38e7330a154177e029ab6c4e18638f2f624053a" -"checksum smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fef582369edb298c6c41319a544ca9c4e83622f226055ccfcb35974fbb55ed34" +"checksum smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp)" = "" "checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f" "checksum stable_deref_trait 1.1.1 (git+https://github.com/kevinaboos/stable_deref_trait.git?branch=spin)" = "" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" diff --git a/Cargo.toml b/Cargo.toml index 907a117923..dc0fd1e896 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,8 @@ qp-trie = { git = "https://github.com/theseus-os/qp-trie-rs" } downcast-rs = { git = "https://github.com/theseus-os/downcast-rs" } ### use the latest version of core_io that supports the latest nightly Rust compiler core_io = { git = "https://github.com/theseus-os/rust-core_io" } +### use the latest version of smoltcp from github; the one on crates.io is out of date +smoltcp = { git = "https://github.com/m-labs/smoltcp" } ### These profiles fix the new rustc behavior of splitting one crate into many object files. diff --git a/Makefile b/Makefile index 4d52ad29e1..8805b7eeba 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ all: iso IS_WSL = $(shell grep -s 'Microsoft' /proc/version) + ## Tool names/locations for cross-compiling on a Mac OS / macOS host (Darwin). UNAME = $(shell uname -s) ifeq ($(UNAME),Darwin) @@ -34,14 +35,16 @@ GRUB_MKRESCUE = $(GRUB_CROSS)grub-mkrescue ################################################################################################### ### For ensuring that the host computer has the proper version of the Rust compiler ################################################################################################### - +RUSTC_VERSION := $(shell cat rust-toolchain) check_rustc: ifdef RUSTUP_TOOLCHAIN @echo -e 'Warning: You are overriding the Rust toolchain manually via RUSTUP_TOOLCHAIN.' @echo -e 'This may lead to unwanted warnings and errors during compilation.\n' endif - @rustup component add rust-src || (\ - echo -e "\nError: rustup is not installed on this system.";\ +## Building Theseus requires the 'rust-src' component. If we can't install that, install the required rust toolchain and retry. +## If it still doesn't work, issue an error, since 'rustup' is probably missing. + @rustup component add rust-src || (rustup toolchain install $(RUSTC_VERSION) && rustup component add rust-src) || (\ + echo -e "\nError: 'rustup' isn't installed.";\ echo -e "Please install rustup and try again.\n";\ exit 1) diff --git a/applications/cat/Cargo.toml b/applications/cat/Cargo.toml index 916709120a..660d6efcfa 100644 --- a/applications/cat/Cargo.toml +++ b/applications/cat/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Kevin Boos "] build = "../../build.rs" [dependencies] -getopts = { git = "https://github.com/kevinaboos/getopts" } +getopts = "0.2.21" core_io = "0.1" diff --git a/applications/cd/Cargo.toml b/applications/cd/Cargo.toml index 1d9e563792..38c14e0a44 100644 --- a/applications/cd/Cargo.toml +++ b/applications/cd/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Christine Wang "] [dependencies] -getopts = { git = "https://github.com/kevinaboos/getopts" } +getopts = "0.2.21" [dependencies.log] default-features = false diff --git a/applications/cpu/Cargo.toml b/applications/cpu/Cargo.toml index 621b03e80d..f62e7cc81a 100644 --- a/applications/cpu/Cargo.toml +++ b/applications/cpu/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Christine Wang "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.terminal_print] path = "../terminal_print" diff --git a/applications/deps/Cargo.toml b/applications/deps/Cargo.toml index adb2a21246..13fdd2514c 100644 --- a/applications/deps/Cargo.toml +++ b/applications/deps/Cargo.toml @@ -6,7 +6,7 @@ description = "Allows a developer to explore dependencies in Theseus's crate man build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" spin = "0.4.10" [dependencies.itertools] diff --git a/applications/deps/src/lib.rs b/applications/deps/src/lib.rs index ab8e8b8578..8c4797b7ce 100644 --- a/applications/deps/src/lib.rs +++ b/applications/deps/src/lib.rs @@ -20,7 +20,6 @@ extern crate spin; use alloc::{ string::{String}, vec::Vec, - slice::SliceConcatExt, }; use spin::Once; use getopts::{Matches, Options}; diff --git a/applications/example/Cargo.toml b/applications/example/Cargo.toml index 2e396dd5c3..e372b634ec 100644 --- a/applications/example/Cargo.toml +++ b/applications/example/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Kevin Boos "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.terminal_print] path = "../terminal_print" diff --git a/applications/kill/Cargo.toml b/applications/kill/Cargo.toml index 123c96056c..2ac962a95b 100644 --- a/applications/kill/Cargo.toml +++ b/applications/kill/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Christine Wang "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.debugit] path = "../../libs/debugit" diff --git a/applications/less/Cargo.toml b/applications/less/Cargo.toml index d8398fe68a..353ba63e71 100644 --- a/applications/less/Cargo.toml +++ b/applications/less/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Zhiyao Ma "] build = "../../build.rs" [dependencies] -getopts = { git = "https://github.com/kevinaboos/getopts" } +getopts = "0.2.21" spin = "0.4.10" core_io = "0.1" diff --git a/applications/ls/Cargo.toml b/applications/ls/Cargo.toml index 27d4b3affa..8a25780bdb 100644 --- a/applications/ls/Cargo.toml +++ b/applications/ls/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Christine Wang "] [dependencies] -getopts = { git = "https://github.com/kevinaboos/getopts" } +getopts = "0.2.21" [dependencies.log] default-features = false diff --git a/applications/mkdir/Cargo.toml b/applications/mkdir/Cargo.toml index 6ce63340e7..639adf95de 100644 --- a/applications/mkdir/Cargo.toml +++ b/applications/mkdir/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Christine Wang "] [dependencies] -getopts = { git = "https://github.com/kevinaboos/getopts" } +getopts = "0.2.21" [dependencies.terminal_print] path = "../terminal_print" diff --git a/applications/mm_eval/Cargo.toml b/applications/mm_eval/Cargo.toml index bdf2ae4713..693151cc4d 100644 --- a/applications/mm_eval/Cargo.toml +++ b/applications/mm_eval/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Kevin Boos "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" cfg-if = "0.1.6" [dependencies.log] diff --git a/applications/ns/Cargo.toml b/applications/ns/Cargo.toml index b32904fc0a..b02898fe2c 100644 --- a/applications/ns/Cargo.toml +++ b/applications/ns/Cargo.toml @@ -6,7 +6,7 @@ description = "An app for interacting with crate namespaces" build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.terminal_print] path = "../terminal_print" diff --git a/applications/ping/Cargo.toml b/applications/ping/Cargo.toml index aacb4017cc..4fc6d8cfee 100644 --- a/applications/ping/Cargo.toml +++ b/applications/ping/Cargo.toml @@ -5,12 +5,12 @@ description = "pings an IPv4 address and returns ping statistics" authors = ["Barry Shiberu "] build = "../../build.rs" -[dependencies.terminal_print] -path = "../terminal_print" - [dependencies] byteorder = { version = "1.0", default-features = false } -getopts = "0.2.18" +getopts = "0.2.21" + +[dependencies.terminal_print] +path = "../terminal_print" [dependencies.log] @@ -40,7 +40,7 @@ path = "../../kernel/ota_update_client" version = "0.5.0" default-features = false features = [ - "alloc", + "alloc", "ethernet", # "log", "verbose", "proto-ipv4", "proto-igmp", "proto-ipv6", "proto-dhcpv4", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp" diff --git a/applications/pmu_sample_start/Cargo.toml b/applications/pmu_sample_start/Cargo.toml index a6cfa81af1..7d1828414c 100644 --- a/applications/pmu_sample_start/Cargo.toml +++ b/applications/pmu_sample_start/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Aryan Sefidi "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.pmu_x86] path = "../../kernel/pmu_x86" diff --git a/applications/pmu_sample_stop/Cargo.toml b/applications/pmu_sample_stop/Cargo.toml index f744950453..3632fe5cf3 100644 --- a/applications/pmu_sample_stop/Cargo.toml +++ b/applications/pmu_sample_stop/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Aryan Sefidi "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.pmu_x86] path = "../../kernel/pmu_x86" diff --git a/applications/ps/Cargo.toml b/applications/ps/Cargo.toml index e621198ac7..42273d6e4d 100644 --- a/applications/ps/Cargo.toml +++ b/applications/ps/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Christine Wang "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.terminal_print] path = "../terminal_print" diff --git a/applications/pwd/Cargo.toml b/applications/pwd/Cargo.toml index 7043d8d559..84216844b4 100644 --- a/applications/pwd/Cargo.toml +++ b/applications/pwd/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Christine Wang "] [dependencies] -getopts = { git = "https://github.com/kevinaboos/getopts" } +getopts = "0.2.21" [dependencies.terminal_print] path = "../terminal_print" diff --git a/applications/rm/Cargo.toml b/applications/rm/Cargo.toml index 2a242c4828..84aeae242a 100644 --- a/applications/rm/Cargo.toml +++ b/applications/rm/Cargo.toml @@ -6,7 +6,7 @@ build = "../../build.rs" description = "removes the directory from the virtual filesystem" [dependencies] -getopts = { git = "https://github.com/kevinaboos/getopts" } +getopts = "0.2.21" [dependencies.terminal_print] path = "../terminal_print" diff --git a/applications/rq_eval/Cargo.toml b/applications/rq_eval/Cargo.toml index 9e450e9cbe..831e613bf5 100644 --- a/applications/rq_eval/Cargo.toml +++ b/applications/rq_eval/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Kevin Boos "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.log] diff --git a/applications/swap/Cargo.toml b/applications/swap/Cargo.toml index 5e9f0b6a37..d84a55e0b9 100644 --- a/applications/swap/Cargo.toml +++ b/applications/swap/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Kevin Boos "] build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" [dependencies.itertools] version = "0.7.9" diff --git a/applications/swap/src/lib.rs b/applications/swap/src/lib.rs index 9c08c5a419..d3e2d32e70 100644 --- a/applications/swap/src/lib.rs +++ b/applications/swap/src/lib.rs @@ -21,7 +21,6 @@ use alloc::{ string::{String, ToString}, vec::Vec, sync::Arc, - slice::SliceConcatExt, }; use getopts::{Options, Matches}; use mod_mgmt::{NamespaceDir, SwapRequest}; diff --git a/applications/upd/Cargo.toml b/applications/upd/Cargo.toml index 2dab3952b8..1164ddb8c3 100644 --- a/applications/upd/Cargo.toml +++ b/applications/upd/Cargo.toml @@ -6,7 +6,7 @@ description = "Front-end application to communicate with Theseus update server" build = "../../build.rs" [dependencies] -getopts = "0.2.18" +getopts = "0.2.21" spin = "0.4.10" [dependencies.itertools] @@ -47,8 +47,8 @@ path = "../../kernel/network_manager" version = "0.5.0" default-features = false features = [ - "alloc", + "alloc", "ethernet", # "log", "verbose", "proto-ipv4", "proto-igmp", "proto-ipv6", "proto-dhcpv4", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp", -] \ No newline at end of file +] diff --git a/applications/upd/src/lib.rs b/applications/upd/src/lib.rs index aabf2112fc..1a17c0c203 100644 --- a/applications/upd/src/lib.rs +++ b/applications/upd/src/lib.rs @@ -29,7 +29,6 @@ use alloc::{ string::{String, ToString}, vec::Vec, collections::BTreeSet, - slice::SliceConcatExt, }; use spin::Once; use getopts::{Matches, Options}; diff --git a/kernel/apic/Cargo.toml b/kernel/apic/Cargo.toml index 56a7940728..8d6a2d37e0 100644 --- a/kernel/apic/Cargo.toml +++ b/kernel/apic/Cargo.toml @@ -38,7 +38,7 @@ path = "../memory" path = "../kernel_config" [dependencies.raw-cpuid] -version = "6.1.0" +version = "7.0.3" features = [ "use_arch" ] [features] diff --git a/kernel/ethernet_smoltcp_device/Cargo.toml b/kernel/ethernet_smoltcp_device/Cargo.toml index 547aad2baf..1c4e593eae 100644 --- a/kernel/ethernet_smoltcp_device/Cargo.toml +++ b/kernel/ethernet_smoltcp_device/Cargo.toml @@ -22,7 +22,7 @@ version = "1.2.0" version = "0.5.0" default-features = false features = [ - "alloc", + "alloc", "ethernet", # "log", "verbose", "proto-ipv4", "proto-igmp", "proto-ipv6", "proto-dhcpv4", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp", diff --git a/kernel/ethernet_smoltcp_device/src/lib.rs b/kernel/ethernet_smoltcp_device/src/lib.rs index 46d4d88b11..393793043d 100644 --- a/kernel/ethernet_smoltcp_device/src/lib.rs +++ b/kernel/ethernet_smoltcp_device/src/lib.rs @@ -26,7 +26,7 @@ use smoltcp::{ }; use network_interface_card::NetworkInterfaceCard; use nic_buffers::{TransmitBuffer, ReceivedFrame}; -use owning_ref::BoxRef; +use owning_ref::BoxRefMut; use network_manager::NetworkInterface; use core::str::FromStr; @@ -193,8 +193,8 @@ impl<'d, N: NetworkInterfaceCard + 'static> smoltcp::phy::Device<'d> for Etherne } let first_buf_len = received_frame.0[0].length; - let rxbuf_byte_slice = BoxRef::new(Box::new(received_frame)) - .try_map(|rxframe| rxframe.0[0].as_slice::(0, first_buf_len as usize)) + let rxbuf_byte_slice = BoxRefMut::new(Box::new(received_frame)) + .try_map_mut(|rxframe| rxframe.0[0].as_slice_mut::(0, first_buf_len as usize)) .map_err(|e| { error!("EthernetDevice::receive(): couldn't convert receive buffer of length {} into byte slice, error {:?}", first_buf_len, e); e @@ -268,12 +268,12 @@ impl smoltcp::phy::TxToken for TxToken { /// The receive token type used by smoltcp, /// which contains only a `ReceivedFrame` to be consumed later. -pub struct RxToken(BoxRef); +pub struct RxToken(BoxRefMut); impl smoltcp::phy::RxToken for RxToken { - fn consume(self, _timestamp: Instant, f: F) -> smoltcp::Result - where F: FnOnce(&[u8]) -> smoltcp::Result + fn consume(mut self, _timestamp: Instant, f: F) -> smoltcp::Result + where F: FnOnce(&mut [u8]) -> smoltcp::Result { - f(self.0.as_ref()) + f(self.0.as_mut()) } } \ No newline at end of file diff --git a/kernel/frame_buffer_compositor/src/lib.rs b/kernel/frame_buffer_compositor/src/lib.rs index 8d9c835b5e..6b63d20bbf 100644 --- a/kernel/frame_buffer_compositor/src/lib.rs +++ b/kernel/frame_buffer_compositor/src/lib.rs @@ -20,7 +20,6 @@ //! The compositor minimizes the updated parts of a framebuffer and clears the blank parts. Even if the cache is lost or the updated blocks information is `None`, it guarantees the result is the same. #![no_std] -#![feature(const_vec_new)] extern crate alloc; extern crate compositor; diff --git a/kernel/http_client/Cargo.toml b/kernel/http_client/Cargo.toml index d0f815df5a..e2870c86aa 100644 --- a/kernel/http_client/Cargo.toml +++ b/kernel/http_client/Cargo.toml @@ -26,7 +26,7 @@ path = "../../libs/percent_encoding" version = "0.5.0" default-features = false features = [ - "alloc", + "alloc", "ethernet", # "log", "verbose", "proto-ipv4", "proto-igmp", "proto-ipv6", "proto-dhcpv4", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp", diff --git a/kernel/mod_mgmt/src/lib.rs b/kernel/mod_mgmt/src/lib.rs index 936f7dfd64..115e776a51 100644 --- a/kernel/mod_mgmt/src/lib.rs +++ b/kernel/mod_mgmt/src/lib.rs @@ -1,6 +1,5 @@ #![no_std] #![feature(rustc_private)] -#![feature(slice_concat_ext)] #![feature(const_fn)] #[macro_use] extern crate alloc; @@ -33,7 +32,6 @@ use alloc::{ collections::{BTreeMap, btree_map, BTreeSet}, string::{String, ToString}, sync::{Arc, Weak}, - slice::SliceConcatExt, }; use spin::{Mutex, Once}; diff --git a/kernel/network_manager/Cargo.toml b/kernel/network_manager/Cargo.toml index 34b24980dc..0b5b91ae3f 100644 --- a/kernel/network_manager/Cargo.toml +++ b/kernel/network_manager/Cargo.toml @@ -25,7 +25,7 @@ path = "../e1000" version = "0.5.0" default-features = false features = [ - "alloc", + "alloc", "ethernet", # "log", "verbose", "proto-ipv4", "proto-igmp", "proto-ipv6", "proto-dhcpv4", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp", diff --git a/kernel/ota_update_client/Cargo.toml b/kernel/ota_update_client/Cargo.toml index 50a8769557..38b5105af7 100644 --- a/kernel/ota_update_client/Cargo.toml +++ b/kernel/ota_update_client/Cargo.toml @@ -44,7 +44,7 @@ default-features = false version = "0.5.0" default-features = false features = [ - "alloc", + "alloc", "ethernet", # "log", "verbose", "proto-ipv4", "proto-igmp", "proto-ipv6", "proto-dhcpv4", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp", diff --git a/kernel/pmu_x86/Cargo.toml b/kernel/pmu_x86/Cargo.toml index 29da33fa92..9950533bf4 100644 --- a/kernel/pmu_x86/Cargo.toml +++ b/kernel/pmu_x86/Cargo.toml @@ -37,7 +37,7 @@ path = "../pit_clock" path = "../../libs/port_io" [dependencies.raw-cpuid] -version = "6.1.0" +version = "7.0.3" features = [ "use_arch" ] [dependencies.task] diff --git a/kernel/smoltcp_helper/Cargo.toml b/kernel/smoltcp_helper/Cargo.toml index d6595e9016..b98420c402 100644 --- a/kernel/smoltcp_helper/Cargo.toml +++ b/kernel/smoltcp_helper/Cargo.toml @@ -22,7 +22,7 @@ path = "../hpet" version = "0.5.0" default-features = false features = [ - "alloc", + "alloc", "ethernet", # "log", "verbose", "proto-ipv4", "proto-igmp", "proto-ipv6", "proto-dhcpv4", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp", diff --git a/libs/debugit/src/lib.rs b/libs/debugit/src/lib.rs index 09f18391e1..db53b439a9 100644 --- a/libs/debugit/src/lib.rs +++ b/libs/debugit/src/lib.rs @@ -36,9 +36,7 @@ pub struct DebugIt(pub T); impl fmt::Debug for DebugIt { default fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - unsafe { - write!(f, "{{ non-Debug: {} }}", type_name::()) - } + write!(f, "{{ non-Debug: {} }}", type_name::()) } } diff --git a/libs/dfqueue b/libs/dfqueue index b087f59da3..ac22441427 160000 --- a/libs/dfqueue +++ b/libs/dfqueue @@ -1 +1 @@ -Subproject commit b087f59da3bffa3c3261ee65ec146c2855c3e471 +Subproject commit ac224414271ebbaab7ef453a1131eed822136950 diff --git a/libs/mpmc b/libs/mpmc index 12d3dc7af2..d3ae94bd55 160000 --- a/libs/mpmc +++ b/libs/mpmc @@ -1 +1 @@ -Subproject commit 12d3dc7af26e13de0ca478c21891ec1ca40a168f +Subproject commit d3ae94bd55bc0de58aa37a1f98f9e2ac2345ef05 diff --git a/rust-toolchain b/rust-toolchain index a25e46c73e..d0c573035d 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2019-07-09 \ No newline at end of file +nightly-2019-10-14 \ No newline at end of file