Attachment 1559504 Details for Bug 1703542 – use-pnet-subcrates-directly.diff

[patch] use-pnet-subcrates-directly.diff

file_1703542.txt (text/plain), 24.96 KB, created by Igor Raits on 2019-04-27 12:46:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Raits

Created: 2019-04-27 12:46:37 UTC

Size: 24.96 KB

patch

obsolete

>diff --git a/Cargo.lock b/Cargo.lock
>index 70f9448..5e02f69 100644
>--- a/Cargo.lock
>+++ b/Cargo.lock
>@@ -20,7 +20,8 @@ dependencies = [
>  "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
>  "openssh-keys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
>  "openssl 0.10.20 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+ "pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+ "pnet_datalink 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>  "reqwest 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
>  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
>  "serde-xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
>@@ -105,11 +106,6 @@ dependencies = [
>  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "bitflags"
>-version = "0.5.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-
> [[package]]
> name = "bitflags"
> version = "1.0.4"
>@@ -464,11 +460,6 @@ dependencies = [
>  "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "glob"
>-version = "0.2.11"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-
> [[package]]
> name = "h2"
> version = "0.1.14"
>â> ~/t/p/r/afterburn on master â¨¯ cat t.patch                                                                                                                                14:45:56
>diff --git a/Cargo.lock b/Cargo.lock
>index 70f9448..5e02f69 100644
>--- a/Cargo.lock
>+++ b/Cargo.lock
>@@ -20,7 +20,8 @@ dependencies = [
>  "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
>  "openssh-keys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
>  "openssl 0.10.20 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+ "pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+ "pnet_datalink 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>  "reqwest 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
>  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
>  "serde-xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
>@@ -105,11 +106,6 @@ dependencies = [
>  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "bitflags"
>-version = "0.5.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-
> [[package]]
> name = "bitflags"
> version = "1.0.4"
>@@ -464,11 +460,6 @@ dependencies = [
>  "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "glob"
>-version = "0.2.11"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-
> [[package]]
> name = "h2"
> version = "0.1.14"
>@@ -630,14 +621,6 @@ dependencies = [
>  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "log"
>-version = "0.3.9"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
> [[package]]
> name = "log"
> version = "0.4.6"
>@@ -965,19 +948,6 @@ name = "pkg-config"
> version = "0.3.14"
> source = "registry+https://github.com/rust-lang/crates.io-index"
> 
>-[[package]]
>-name = "pnet"
>-version = "0.22.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "ipnetwork 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_datalink 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_packet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_sys 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_transport 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
> [[package]]
> name = "pnet_base"
> version = "0.22.0"
>@@ -995,36 +965,6 @@ dependencies = [
>  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "pnet_macros"
>-version = "0.21.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
>- "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)",
>- "syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
>-[[package]]
>-name = "pnet_macros_support"
>-version = "0.22.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
>-[[package]]
>-name = "pnet_packet"
>-version = "0.22.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_macros 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_macros_support 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
> [[package]]
> name = "pnet_sys"
> version = "0.22.0"
>@@ -1035,17 +975,6 @@ dependencies = [
>  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "pnet_transport"
>-version = "0.22.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_packet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "pnet_sys 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
> [[package]]
> name = "proc-macro2"
> version = "0.4.24"
>@@ -1182,18 +1111,6 @@ dependencies = [
>  "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "regex"
>-version = "0.2.11"
>-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.2 (registry+https://github.com/rust-lang/crates.io-index)",
>- "regex-syntax 0.5.6 (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"
> version = "1.1.0"
>@@ -1206,14 +1123,6 @@ dependencies = [
>  "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "regex-syntax"
>-version = "0.5.6"
>-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)",
>-]
>-
> [[package]]
> name = "regex-syntax"
> version = "0.6.4"
>@@ -1267,11 +1176,6 @@ name = "rustc-demangle"
> version = "0.1.13"
> source = "registry+https://github.com/rust-lang/crates.io-index"
> 
>-[[package]]
>-name = "rustc-serialize"
>-version = "0.3.24"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-
> [[package]]
> name = "rustc_version"
> version = "0.2.3"
>@@ -1481,51 +1385,6 @@ dependencies = [
>  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "syntex"
>-version = "0.42.2"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
>-[[package]]
>-name = "syntex_errors"
>-version = "0.42.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
>- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
>- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
>- "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
>- "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
>-[[package]]
>-name = "syntex_pos"
>-version = "0.42.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
>-[[package]]
>-name = "syntex_syntax"
>-version = "0.42.0"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
>- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
>- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
>- "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
>- "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
>- "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
> [[package]]
> name = "take_mut"
> version = "0.2.2"
>@@ -1553,15 +1412,6 @@ dependencies = [
>  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
> ]
> 
>-[[package]]
>-name = "term"
>-version = "0.4.6"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-dependencies = [
>- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
>- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
>-]
>-
> [[package]]
> name = "term"
> version = "0.5.1"
>@@ -1773,11 +1623,6 @@ name = "unicode-width"
> version = "0.1.5"
> source = "registry+https://github.com/rust-lang/crates.io-index"
> 
>-[[package]]
>-name = "unicode-xid"
>-version = "0.0.3"
>-source = "registry+https://github.com/rust-lang/crates.io-index"
>-
> [[package]]
> name = "unicode-xid"
> version = "0.1.0"
>@@ -1925,7 +1770,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
> "checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637"
> "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
> "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
>-"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
> "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
> "checksum block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49665c62e0e700857531fa5d3763e91b539ff1abeebd56808d378b495870d60d"
> "checksum block-padding 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc4358306e344bf9775d0197fd00d2603e5afb0771bb353538630f022068ea3"
>@@ -1969,7 +1813,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
> "checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
> "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
> "checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592"
>-"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
> "checksum h2 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1ac030ae20dee464c5d0f36544d8b914a6bc606da44a57e052d2b0f5dae129e0"
> "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
> "checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
>@@ -1987,7 +1830,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
> "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
> "checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
> "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
>-"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
> "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
> "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
> "checksum md-5 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8"
>@@ -2023,14 +1865,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
> "checksum phf_generator 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "03dc191feb9b08b0dc1330d6549b795b9d81aec19efe6b4a45aec8d4caee0c4b"
> "checksum phf_shared 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "b539898d22d4273ded07f64a05737649dc69095d92cb87c7097ec68e3f150b93"
> "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
>-"checksum pnet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d693c84430248366146e3181ff9d330243464fa9e6146c372b2f3eb2e2d8e7"
> "checksum pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4df28acf2fcc77436dd2b91a9a0c2bb617f9ca5f2acefee1a4135058b9f9801f"
> "checksum pnet_datalink 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b34f8ca857599d05b6b082e9baff8d27c54cb9c26568cf3c0993a5755816966"
>-"checksum pnet_macros 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d228096fd739d4e3e60dee9e1e4f07d9ae0f3f309c876834192538748e561e4"
>-"checksum pnet_macros_support 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "84684f2cddefc37a06f2fe2ca4dcc3457fc3b282734b5246507d8ee75d2780ae"
>-"checksum pnet_packet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a6cdcdaddc5174f18286298842a4e31cd3cc018933d42af51434b1fa07dcbe"
> "checksum pnet_sys 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "682b2eca84cc440bce8336813f78eb6d3cb0fed89fe0e87ae22acfca8363f176"
>-"checksum pnet_transport 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5faa55dcf725487a699adcff88dfea8f17ea34fa2640528866d9acbb4e3a104f"
> "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
> "checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d"
> "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
>@@ -2046,14 +1883,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
> "checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3"
> "checksum redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "a84bcd297b87a545980a2d25a0beb72a1f490c31f0a9fde52fca35bfbb1ceb70"
> "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
>-"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
> "checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
>-"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
> "checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
> "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
> "checksum reqwest 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "943b9f85622f53bcf71721e0996f23688e3942e51fc33766c2e24a959316767b"
> "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
>-"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
> "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 schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56"
>@@ -2080,14 +1914,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
> "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
> "checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
> "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
>-"checksum syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317"
>-"checksum syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646"
>-"checksum syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6"
>-"checksum syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d"
> "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
> "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
> "checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a"
>-"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
> "checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
> "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
> "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
>@@ -2111,7 +1940,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
> "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"
> "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
>-"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
> "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
> "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
> "checksum update-ssh-keys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0298c91808bf479196f81c31a41d07a53e8fa89024416c99d342fe09078a035c"
>diff --git a/Cargo.toml b/Cargo.toml
>index 67ad038..a0f9d4d 100644
>--- a/Cargo.toml
>+++ b/Cargo.toml
>@@ -26,7 +26,8 @@ mime = "0.3"
> nix = "^0.13.0"
> openssh-keys = "^0.4.1"
> openssl = "^0.10.20"
>-pnet = "0.22"
>+pnet_base = "0.22"
>+pnet_datalink = "0.22"
> reqwest = "^0.9.15"
> serde = "1.0"
> serde-xml-rs = "0.3"
>diff --git a/src/main.rs b/src/main.rs
>index 337f3da..9743425 100644
>--- a/src/main.rs
>+++ b/src/main.rs
>@@ -22,7 +22,6 @@ extern crate ipnetwork;
> extern crate nix;
> extern crate openssh_keys;
> extern crate openssl;
>-extern crate pnet;
> extern crate reqwest;
> #[macro_use]
> extern crate serde_derive;
>diff --git a/src/network.rs b/src/network.rs
>index f084a75..d12037d 100644
>--- a/src/network.rs
>+++ b/src/network.rs
>@@ -16,7 +16,7 @@
> //! interface unit files. All that is left is to write the resulting string to
> //! the necessary unit.
> 
>-use pnet::util::MacAddr;
>+use pnet_base::MacAddr;
> use std::net::IpAddr;
> use std::string::String;
> use std::string::ToString;
>diff --git a/src/providers/digitalocean/mod.rs b/src/providers/digitalocean/mod.rs
>index eeaa7c2..e6ad868 100644
>--- a/src/providers/digitalocean/mod.rs
>+++ b/src/providers/digitalocean/mod.rs
>@@ -21,7 +21,7 @@ use std::str::FromStr;
> use ipnetwork;
> use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network};
> use openssh_keys::PublicKey;
>-use pnet::util::MacAddr;
>+use pnet_base::MacAddr;
> 
> use crate::errors::*;
> use crate::network;
>diff --git a/src/providers/packet/mod.rs b/src/providers/packet/mod.rs
>index f471baf..3a42520 100644
>--- a/src/providers/packet/mod.rs
>+++ b/src/providers/packet/mod.rs
>@@ -23,7 +23,7 @@ use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
> use std::str::FromStr;
> 
> use openssh_keys::PublicKey;
>-use pnet::util::MacAddr;
>+use pnet_base::MacAddr;
> 
> use crate::errors::*;
> use crate::network::{self, Device, Interface, NetworkRoute, Section};
>diff --git a/src/providers/vagrant_virtualbox/mod.rs b/src/providers/vagrant_virtualbox/mod.rs
>index e4d4109..5d5ee40 100644
>--- a/src/providers/vagrant_virtualbox/mod.rs
>+++ b/src/providers/vagrant_virtualbox/mod.rs
>@@ -21,7 +21,7 @@ use std::time::Duration;
> 
> use hostname;
> use openssh_keys::PublicKey;
>-use pnet;
>+use pnet_datalink;
> 
> use crate::errors::*;
> use crate::network;
>@@ -52,8 +52,8 @@ impl VagrantVirtualboxProvider {
>         Err("eth1 was not found!".into())
>     }
> 
>-    fn find_eth1() -> Option<pnet::datalink::NetworkInterface> {
>-        let mut ifaces = pnet::datalink::interfaces();
>+    fn find_eth1() -> Option<pnet_datalink::NetworkInterface> {
>+        let mut ifaces = pnet_datalink::interfaces();
>         ifaces.retain(|i| i.name == "eth1");
>         if !ifaces.is_empty() {
>             Some(ifaces[0].clone())
>diff --git a/src/util/mod.rs b/src/util/mod.rs
>index 80ab3c7..daa49b1 100644
>--- a/src/util/mod.rs
>+++ b/src/util/mod.rs
>@@ -16,7 +16,7 @@
> 
> use crate::errors::*;
> use crate::retry;
>-use pnet;
>+use pnet_datalink;
> use std::fs::File;
> use std::io::{BufRead, BufReader, Read};
> use std::path::Path;
>@@ -52,7 +52,7 @@ pub fn key_lookup<R: Read>(delim: char, key: &str, reader: R) -> Result<Option<S
> }
> 
> pub fn dns_lease_key_lookup(key: &str) -> Result<String> {
>-    let interfaces = pnet::datalink::interfaces();
>+    let interfaces = pnet_datalink::interfaces();
>     trace!("interfaces - {:?}", interfaces);
> 
>     retry::Retry::new()

Actions: View | Diff

Attachments on bug 1703542: 1559307 | 1559504