diff --git a/Cargo.lock b/Cargo.lock
index 27d1d7b9e49b1634a10f7dc050bff03cb72c267e..8eafacfd32636ab62f42495604d8cda548959137 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,7 +3,7 @@ name = "aho-corasick"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -14,25 +14,31 @@ dependencies = [
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "autocfg"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "backtrace"
-version = "0.3.9"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "backtrace-sys"
-version = "0.1.24"
+version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -57,14 +63,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "cc"
-version = "1.0.25"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -79,7 +85,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clippy_lints 0.0.209 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -91,16 +97,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
"if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -115,7 +121,7 @@ name = "error-chain"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -152,7 +158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "itertools"
-version = "0.7.8"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -172,7 +178,7 @@ dependencies = [
"goblin 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
"linked_list_allocator 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"raw-cpuid 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.44",
+ "redox_syscall 0.1.45",
"slab_allocator 0.3.1",
"spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"x86 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -185,7 +191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libc"
-version = "0.2.43"
+version = "0.2.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -203,11 +209,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "memchr"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
"version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -265,31 +271,31 @@ version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "redox_syscall"
-version = "0.1.44"
+version = "0.1.45"
[[package]]
name = "regex"
-version = "1.0.6"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "regex-syntax"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -297,7 +303,7 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.9"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -327,7 +333,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -337,17 +343,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "serde"
-version = "1.0.80"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "serde_derive"
-version = "1.0.80"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -357,7 +363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -375,7 +381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "syn"
-version = "0.15.21"
+version = "0.15.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -393,10 +399,10 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.4.8"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -478,13 +484,14 @@ dependencies = [
[metadata]
"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
-"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
+"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1efca0b863ca03ed4c109fb1c55e0bc4bbeb221d3e103d86251046b06a526bd0"
-"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
"checksum clippy 0.0.209 (registry+https://github.com/rust-lang/crates.io-index)" = "fe56cba96f8d67cd3af996bd2c61fbfea263cc555db9180dc1f7413418454c7d"
"checksum clippy_lints 0.0.209 (registry+https://github.com/rust-lang/crates.io-index)" = "891679ac4d0890425ce9aa4db6ab7c05a60506048fb5e0fc2ae2eeaeb02626e8"
@@ -494,13 +501,13 @@ dependencies = [
"checksum goblin 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "5e3ba9fec4dc9a09553388bff2724d3bf06bd64013539f2d3e1e3838eefb310a"
"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
"checksum if_chain 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec"
-"checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
+"checksum itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d"
"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
-"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
+"checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74"
"checksum linked_list_allocator 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "655d57c71827fe0891ce72231b6aa5e14033dae3f604609e6a6f807267c1678d"
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16"
+"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
@@ -509,21 +516,21 @@ dependencies = [
"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
"checksum raw-cpuid 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13b844e4049605ff38fed943f5c7b2c691fad68d9d5bf074d2720554c4e48246"
"checksum raw-cpuid 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90e0d3209fac374e168cef2d8806dde7b31ef0ee82a965bcc0bec562c078a6f5"
-"checksum regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ee84f70c8c08744ea9641a731c7fadb475bf2ecc52d7f627feb833e0b3990467"
-"checksum regex-syntax 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fbc557aac2b708fe84121caf261346cc2eed71978024337e42eb46b8a252ac6e"
-"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
+"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
+"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
+"checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7"
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383"
"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 serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)" = "15c141fc7027dd265a47c090bf864cf62b42c4d228bbcf4e51a0c9e2b0d3f7ef"
-"checksum serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)" = "225de307c6302bec3898c51ca302fc94a7a1697ef0845fcee6448f33c032249c"
+"checksum serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)" = "157e12af46859e968da75dea9845530e13d03bcab2009a41b9b7bb3cf4eb3ec2"
+"checksum serde_derive 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)" = "9469829702497daf2daf3c190e130c3fa72f719920f73c86160d43e8f8d76951"
"checksum serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "c37ccd6be3ed1fdf419ee848f7c758eb31b054d7cd3ae3600e3bae0adf569811"
"checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f"
-"checksum syn 0.15.21 (registry+https://github.com/rust-lang/crates.io-index)" = "816b7af21405b011a23554ea2dc3f6576dc86ca557047c34098c1d741f10f823"
+"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum toml 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4a2ecc31b0351ea18b3fe11274b8db6e4d82bce861bbb22e6dbed40417902c65"
+"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
diff --git a/src/context/memory.rs b/src/context/memory.rs
index bef60700cb0ae65dcbe9fb00eae902b6b1c77994..7ec1f809760a739be8eb112c271f845464d5fdaa 100644
--- a/src/context/memory.rs
+++ b/src/context/memory.rs
@@ -42,6 +42,28 @@ impl Grant {
}
}
+ pub fn map(to: VirtualAddress, size: usize, flags: EntryFlags) -> Grant {
+ let mut active_table = unsafe { ActivePageTable::new() };
+
+ let mut flush_all = MapperFlushAll::new();
+
+ let start_page = Page::containing_address(to);
+ let end_page = Page::containing_address(VirtualAddress::new(to.get() + size - 1));
+ for page in Page::range_inclusive(start_page, end_page) {
+ let result = active_table.map(page, flags);
+ flush_all.consume(result);
+ }
+
+ flush_all.flush(&mut active_table);
+
+ Grant {
+ start: to,
+ size: size,
+ flags: flags,
+ mapped: true
+ }
+ }
+
pub fn map_inactive(from: VirtualAddress, to: VirtualAddress, size: usize, flags: EntryFlags, new_table: &mut InactivePageTable, temporary_page: &mut TemporaryPage) -> Grant {
let mut active_table = unsafe { ActivePageTable::new() };
diff --git a/src/scheme/memory.rs b/src/scheme/memory.rs
index 6826c2e2a65bc84810d1528528d0111bd901fdfb..5dfd927937e4cfbdb3076694746adf84bbdd3e2a 100644
--- a/src/scheme/memory.rs
+++ b/src/scheme/memory.rs
@@ -1,36 +1,22 @@
-use alloc::collections::BTreeMap;
-use alloc::vec::Vec;
-use core::sync::atomic::{AtomicUsize, Ordering};
+use context;
+use context::memory::Grant;
use memory::{free_frames, used_frames};
-use spin::Mutex;
-
-use syscall::data::StatVfs;
+use paging::VirtualAddress;
+use paging::entry::EntryFlags;
+use syscall::data::{Map, StatVfs};
use syscall::error::*;
+use syscall::flag::{PROT_EXEC, PROT_READ, PROT_WRITE};
use syscall::scheme::Scheme;
-use syscall;
-struct Address {
- phys: usize,
- len: usize,
- virt: usize
-}
-pub struct MemoryScheme {
- handles: Mutex<BTreeMap<usize, Vec<Address>>>,
- next_id: AtomicUsize
-}
+pub struct MemoryScheme;
impl MemoryScheme {
pub fn new() -> Self {
- Self {
- handles: Mutex::new(BTreeMap::new()),
- next_id: AtomicUsize::new(0)
- }
+ MemoryScheme
}
}
impl Scheme for MemoryScheme {
fn open(&self, _path: &[u8], _flags: usize, _uid: u32, _gid: u32) -> Result<usize> {
- let id = self.next_id.fetch_add(1, Ordering::SeqCst);
- self.handles.lock().insert(id, Vec::new());
Ok(0)
}
@@ -46,24 +32,52 @@ impl Scheme for MemoryScheme {
Ok(0)
}
- fn fmap(&self, id: usize, _offset: usize, len: usize) -> Result<usize> {
- let mut handles = self.handles.lock();
- let handle = handles.get_mut(&id).ok_or(Error::new(ENOENT))?;
+ fn fmap(&self, _id: usize, map: &Map) -> Result<usize> {
+ //TODO: Abstract with other grant creation
+ if map.size == 0 {
+ Ok(0)
+ } else {
+ let contexts = context::contexts();
+ let context_lock = contexts.current().ok_or(Error::new(ESRCH))?;
+ let context = context_lock.read();
+
+ let mut grants = context.grants.lock();
+
+ let full_size = ((map.size + 4095)/4096) * 4096;
+ let mut to_address = ::USER_GRANT_OFFSET;
- // Warning: These functions are bypassing the root check.
- let phys = syscall::inner_physalloc(len)?;
- let virt = syscall::inner_physmap(phys, len, syscall::flag::MAP_WRITE).map_err(|err| {
- syscall::inner_physfree(phys, len).expect("newly allocated region failed to free");
- err
- })?;
+ let mut entry_flags = EntryFlags::PRESENT | EntryFlags::USER_ACCESSIBLE;
+ if map.flags & PROT_EXEC == 0 {
+ entry_flags |= EntryFlags::NO_EXECUTE;
+ }
+ if map.flags & PROT_READ > 0 {
+ //TODO: PROT_READ
+ }
+ if map.flags & PROT_WRITE > 0 {
+ entry_flags |= EntryFlags::WRITABLE;
+ }
- handle.push(Address {
- phys,
- len,
- virt
- });
+ let mut i = 0;
+ while i < grants.len() {
+ let start = grants[i].start_address().get();
+ if to_address + full_size < start {
+ break;
+ }
- Ok(virt)
+ let pages = (grants[i].size() + 4095) / 4096;
+ let end = start + pages * 4096;
+ to_address = end;
+ i += 1;
+ }
+
+ grants.insert(i, Grant::map(
+ VirtualAddress::new(to_address),
+ full_size,
+ entry_flags
+ ));
+
+ Ok(to_address)
+ }
}
fn fcntl(&self, _id: usize, _cmd: usize, _arg: usize) -> Result<usize> {
@@ -80,23 +94,7 @@ impl Scheme for MemoryScheme {
Ok(i)
}
- fn close(&self, id: usize) -> Result<usize> {
- let allocations = self.handles.lock()
- .remove(&id)
- .ok_or(Error::new(ENOENT))?;
-
- for addr in allocations {
- // physunmap fails if already unmapped
- // physfree can't currently fail
- //
- // What if somebody with root already freed the physical address?
- // (But left the mapping, which means we attempt to free it again)
- // I'd rather not think about it.
- // (Still, that requires root)
- let _ = syscall::inner_physunmap(addr.virt)
- .and_then(|_| syscall::inner_physfree(addr.phys, addr.len));
- }
-
+ fn close(&self, _id: usize) -> Result<usize> {
Ok(0)
}
}
diff --git a/src/scheme/user.rs b/src/scheme/user.rs
index eab5704c031a7ab4ce7adf20316ca7ff22a315e0..9b6e6b5986afe788e18c6740f8016d777fd6d634 100644
--- a/src/scheme/user.rs
+++ b/src/scheme/user.rs
@@ -13,9 +13,9 @@ use paging::entry::EntryFlags;
use paging::temporary_page::TemporaryPage;
use scheme::{AtomicSchemeId, ATOMIC_SCHEMEID_INIT, SchemeId};
use sync::{WaitQueue, WaitMap};
-use syscall::data::{Packet, Stat, StatVfs, TimeSpec};
+use syscall::data::{Map, Packet, Stat, StatVfs, TimeSpec};
use syscall::error::*;
-use syscall::flag::{EVENT_READ, O_NONBLOCK};
+use syscall::flag::{EVENT_READ, O_NONBLOCK, PROT_EXEC, PROT_READ, PROT_WRITE};
use syscall::number::*;
use syscall::scheme::Scheme;
@@ -28,7 +28,7 @@ pub struct UserInner {
next_id: AtomicU64,
context: Weak<RwLock<Context>>,
todo: WaitQueue<Packet>,
- fmap: Mutex<BTreeMap<u64, (Weak<RwLock<Context>>, usize)>>,
+ fmap: Mutex<BTreeMap<u64, (Weak<RwLock<Context>>, Map)>>,
done: WaitMap<u64, usize>
}
@@ -78,14 +78,15 @@ impl UserInner {
}
pub fn capture(&self, buf: &[u8]) -> Result<usize> {
- UserInner::capture_inner(&self.context, buf.as_ptr() as usize, buf.len(), false)
+ UserInner::capture_inner(&self.context, buf.as_ptr() as usize, buf.len(), PROT_READ)
}
pub fn capture_mut(&self, buf: &mut [u8]) -> Result<usize> {
- UserInner::capture_inner(&self.context, buf.as_mut_ptr() as usize, buf.len(), true)
+ UserInner::capture_inner(&self.context, buf.as_mut_ptr() as usize, buf.len(), PROT_WRITE)
}
- fn capture_inner(context_weak: &Weak<RwLock<Context>>, address: usize, size: usize, writable: bool) -> Result<usize> {
+ fn capture_inner(context_weak: &Weak<RwLock<Context>>, address: usize, size: usize, flags: usize) -> Result<usize> {
+ //TODO: Abstract with other grant creation
if size == 0 {
Ok(0)
} else {
@@ -102,36 +103,35 @@ impl UserInner {
let full_size = ((offset + size + 4095)/4096) * 4096;
let mut to_address = ::USER_GRANT_OFFSET;
- let mut flags = EntryFlags::PRESENT | EntryFlags::NO_EXECUTE | EntryFlags::USER_ACCESSIBLE;
- if writable {
- flags |= EntryFlags::WRITABLE;
+ let mut entry_flags = EntryFlags::PRESENT | EntryFlags::USER_ACCESSIBLE;
+ if flags & PROT_EXEC == 0 {
+ entry_flags |= EntryFlags::NO_EXECUTE;
+ }
+ if flags & PROT_READ > 0 {
+ //TODO: PROT_READ
+ }
+ if flags & PROT_WRITE > 0 {
+ entry_flags |= EntryFlags::WRITABLE;
}
- for i in 0 .. grants.len() {
+ let mut i = 0;
+ while i < grants.len() {
let start = grants[i].start_address().get();
if to_address + full_size < start {
- grants.insert(i, Grant::map_inactive(
- VirtualAddress::new(from_address),
- VirtualAddress::new(to_address),
- full_size,
- flags,
- &mut new_table,
- &mut temporary_page
- ));
-
- return Ok(to_address + offset);
- } else {
- let pages = (grants[i].size() + 4095) / 4096;
- let end = start + pages * 4096;
- to_address = end;
+ break;
}
+
+ let pages = (grants[i].size() + 4095) / 4096;
+ let end = start + pages * 4096;
+ to_address = end;
+ i += 1;
}
- grants.push(Grant::map_inactive(
+ grants.insert(i, Grant::map_inactive(
VirtualAddress::new(from_address),
VirtualAddress::new(to_address),
full_size,
- flags,
+ entry_flags,
&mut new_table,
&mut temporary_page
));
@@ -186,9 +186,9 @@ impl UserInner {
_ => println!("Unknown scheme -> kernel message {}", packet.a)
}
} else {
- if let Some((context_weak, size)) = self.fmap.lock().remove(&packet.id) {
+ if let Some((context_weak, map)) = self.fmap.lock().remove(&packet.id) {
if let Ok(address) = Error::demux(packet.a) {
- packet.a = Error::mux(UserInner::capture_inner(&context_weak, address, size, true));
+ packet.a = Error::mux(UserInner::capture_inner(&context_weak, address, map.size, map.flags));
}
}
@@ -304,9 +304,11 @@ impl Scheme for UserScheme {
inner.call(SYS_FEVENT, file, flags, 0)
}
- fn fmap(&self, file: usize, offset: usize, size: usize) -> Result<usize> {
+ fn fmap(&self, file: usize, map: &Map) -> Result<usize> {
let inner = self.inner.upgrade().ok_or(Error::new(ENODEV))?;
+ let address = inner.capture(map)?;
+
let (pid, uid, gid, context_lock) = {
let contexts = context::contexts();
let context_lock = contexts.current().ok_or(Error::new(ESRCH))?;
@@ -316,18 +318,22 @@ impl Scheme for UserScheme {
let id = inner.next_id.fetch_add(1, Ordering::SeqCst);
- inner.fmap.lock().insert(id, (context_lock, size));
+ inner.fmap.lock().insert(id, (context_lock, *map));
- inner.call_inner(Packet {
+ let result = inner.call_inner(Packet {
id: id,
pid: pid.into(),
uid: uid,
gid: gid,
a: SYS_FMAP,
b: file,
- c: offset,
- d: size
- })
+ c: address,
+ d: mem::size_of::<Map>()
+ });
+
+ let _ = inner.release(address);
+
+ result
}
fn fpath(&self, file: usize, buf: &mut [u8]) -> Result<usize> {
diff --git a/src/syscall/debug.rs b/src/syscall/debug.rs
index 92a43bf433f97a276b3b12c80f5bb79aaf6adf41..7f746c683df605127d5431f128afea666d66fd81 100644
--- a/src/syscall/debug.rs
+++ b/src/syscall/debug.rs
@@ -3,7 +3,7 @@ use core::ops::Range;
use alloc::string::String;
use alloc::vec::Vec;
-use super::data::{Stat, TimeSpec};
+use super::data::{Map, Stat, TimeSpec};
use super::flag::*;
use super::number::*;
use super::validate::*;
@@ -131,10 +131,12 @@ pub fn format_call(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize) -
d
),
SYS_FMAP => format!(
- "fmap({}, {:#X}, {})",
+ "fmap({}, {:?})",
b,
- c,
- d
+ validate_slice(
+ c as *const Map,
+ d/mem::size_of::<Map>()
+ ),
),
SYS_FUNMAP => format!(
"funmap({:#X})",
diff --git a/src/syscall/driver.rs b/src/syscall/driver.rs
index 68c9d2522e65a78b0ec95dcc5c396a249517bb56..0529bc9ca57cbfcba53fc8195f3f6e30041488d4 100644
--- a/src/syscall/driver.rs
+++ b/src/syscall/driver.rs
@@ -5,7 +5,7 @@ use paging::entry::EntryFlags;
use context;
use context::memory::Grant;
use syscall::error::{Error, EFAULT, EINVAL, ENOMEM, EPERM, ESRCH, Result};
-use syscall::flag::{MAP_WRITE, MAP_WRITE_COMBINE};
+use syscall::flag::{PHYSMAP_WRITE, PHYSMAP_WRITE_COMBINE};
fn enforce_root() -> Result<()> {
let contexts = context::contexts();
@@ -51,6 +51,7 @@ pub fn physfree(physical_address: usize, size: usize) -> Result<usize> {
//TODO: verify exlusive access to physical memory
pub fn inner_physmap(physical_address: usize, size: usize, flags: usize) -> Result<usize> {
+ //TODO: Abstract with other grant creation
if size == 0 {
Ok(0)
} else {
@@ -66,32 +67,27 @@ pub fn inner_physmap(physical_address: usize, size: usize, flags: usize) -> Resu
let mut to_address = ::USER_GRANT_OFFSET;
let mut entry_flags = EntryFlags::PRESENT | EntryFlags::NO_EXECUTE | EntryFlags::USER_ACCESSIBLE;
- if flags & MAP_WRITE == MAP_WRITE {
+ if flags & PHYSMAP_WRITE == PHYSMAP_WRITE {
entry_flags |= EntryFlags::WRITABLE;
}
- if flags & MAP_WRITE_COMBINE == MAP_WRITE_COMBINE {
+ if flags & PHYSMAP_WRITE_COMBINE == PHYSMAP_WRITE_COMBINE {
entry_flags |= EntryFlags::HUGE_PAGE;
}
- for i in 0 .. grants.len() {
+ let mut i = 0;
+ while i < grants.len() {
let start = grants[i].start_address().get();
if to_address + full_size < start {
- grants.insert(i, Grant::physmap(
- PhysicalAddress::new(from_address),
- VirtualAddress::new(to_address),
- full_size,
- entry_flags
- ));
-
- return Ok(to_address + offset);
- } else {
- let pages = (grants[i].size() + 4095) / 4096;
- let end = start + pages * 4096;
- to_address = end;
+ break;
}
+
+ let pages = (grants[i].size() + 4095) / 4096;
+ let end = start + pages * 4096;
+ to_address = end;
+ i += 1;
}
- grants.push(Grant::physmap(
+ grants.insert(i, Grant::physmap(
PhysicalAddress::new(from_address),
VirtualAddress::new(to_address),
full_size,
diff --git a/syscall b/syscall
index f479a66884984a8efd7520bd9767e745730db953..31b7ae8eef2b108e453c2f9b154ca516be900c11 160000
--- a/syscall
+++ b/syscall
@@ -1 +1 @@
-Subproject commit f479a66884984a8efd7520bd9767e745730db953
+Subproject commit 31b7ae8eef2b108e453c2f9b154ca516be900c11