From 424c7859e0bdd36d321792aa7336d3a8bdd558c5 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 15 Jun 2021 22:17:30 +0000 Subject: [PATCH] Bug 1716518 - Upgrade raw-cpuid to v7.0.4. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D117842 --- Cargo.lock | 4 +- .../rust/raw-cpuid/.cargo-checksum.json | 2 +- third_party/rust/raw-cpuid/Cargo.lock | 116 ++++++++++-------- third_party/rust/raw-cpuid/Cargo.toml | 2 +- third_party/rust/raw-cpuid/examples/cpu.rs | 27 ---- third_party/rust/raw-cpuid/src/lib.rs | 2 +- 6 files changed, 67 insertions(+), 86 deletions(-) delete mode 100644 third_party/rust/raw-cpuid/examples/cpu.rs diff --git a/Cargo.lock b/Cargo.lock index f29d091c0a1c..45d00f044ba0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4092,9 +4092,9 @@ source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5a [[package]] name = "raw-cpuid" -version = "7.0.3" +version = "7.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf" +checksum = "beb71f708fe39b2c5e98076204c3cc094ee5a4c12c4cdb119a2b72dc34164f41" dependencies = [ "bitflags", "cc", diff --git a/third_party/rust/raw-cpuid/.cargo-checksum.json b/third_party/rust/raw-cpuid/.cargo-checksum.json index 3fa0c0d5cbe0..f8415000b661 100644 --- a/third_party/rust/raw-cpuid/.cargo-checksum.json +++ b/third_party/rust/raw-cpuid/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"AUTHORS":"f435ebf37000741d24baea378a85227fd6dcd57612a384ae7aea09e8525f9a1c","Cargo.lock":"624d0112a4e79cf39d3c19f974e1cfffb6d1d1297c617d42a56b3c81766d4ff7","Cargo.toml":"656c0b786a78bd17e4b28f6d8ce989114d42a11f0cc9e9d071230e8777ee238a","LICENSE.md":"cdd45f4d0c552c3a51725728215919e0dedb1e1af250f130e7c2d60eef6721fe","README.md":"0eb82fa97cceb17f63e2d089258fd2db3581d226dd214951f335a88c1450684f","build.rs":"543d76bcb20e6b8e29bbbb7ac47a62efbc62db1422a0f67d6f16a8a1cc5a55c3","ci/before_deploy.ps1":"a8ee0204dd1397a245a47626fecd98eff5da76e12b15139c06271b3cc309a3e1","ci/before_deploy.sh":"ea008e2c544482cba5b659c17887ccd5354779c629096f28e667d40391299cc5","ci/install.sh":"8841985e8645d391829ba52cd669bc5c5d98b1fdd8979c7cfd3cd3573c4a0a4b","ci/script.sh":"e52273d595c672884a2a8b429765aa04708b01735055bc8e11bd3ae73d57bab2","examples/cache.rs":"c8fc57159c15a67aaf64cba3f68405357e99c55607c4f8c5ff2cb7d88fb56c30","examples/cpu.rs":"d868a1b27494ed2d2cf3a940fc51ce50cbb56545575b43d47eea82a663cdf02b","examples/topology.rs":"514a41877c4f2f7a8835c700667e87b78b72e28a695e43da35c0fde512c68a85","examples/tsc_frequency.rs":"f5fb92a82b72d6bd8a55006d9b494da650c5bb398c0635f198616196421f243c","src/bin/cpuid.rs":"10f50c6e5d2917cea59c273b2bad439646c5ca53b8224a44c80ca30c7b378408","src/cpuid.c":"79fa0d852dba6e5e8fd1e7a0e9b8e28369818651a25bbf5d4a0c5e79320053aa","src/lib.rs":"27a1278fd3a1de7c529a98de05658dc328463ee14e05761a68ac388182e7a31e","src/tests.rs":"0fbdd825301037d7f6efc01ba6931e46b33d3363e27bb3c982cdb86a55c2518b"},"package":"b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf"} \ No newline at end of file +{"files":{"AUTHORS":"f435ebf37000741d24baea378a85227fd6dcd57612a384ae7aea09e8525f9a1c","Cargo.lock":"927f24202e9a1cd63fe12ea1d43059ffb34970867cdea496db5d1045d4ab5467","Cargo.toml":"e532cb7c0e8b069846b46076c78085c63d2ff85ffcb684c2dd9cccbc740cfcad","LICENSE.md":"cdd45f4d0c552c3a51725728215919e0dedb1e1af250f130e7c2d60eef6721fe","README.md":"0eb82fa97cceb17f63e2d089258fd2db3581d226dd214951f335a88c1450684f","build.rs":"543d76bcb20e6b8e29bbbb7ac47a62efbc62db1422a0f67d6f16a8a1cc5a55c3","ci/before_deploy.ps1":"a8ee0204dd1397a245a47626fecd98eff5da76e12b15139c06271b3cc309a3e1","ci/before_deploy.sh":"ea008e2c544482cba5b659c17887ccd5354779c629096f28e667d40391299cc5","ci/install.sh":"8841985e8645d391829ba52cd669bc5c5d98b1fdd8979c7cfd3cd3573c4a0a4b","ci/script.sh":"e52273d595c672884a2a8b429765aa04708b01735055bc8e11bd3ae73d57bab2","examples/cache.rs":"c8fc57159c15a67aaf64cba3f68405357e99c55607c4f8c5ff2cb7d88fb56c30","examples/topology.rs":"514a41877c4f2f7a8835c700667e87b78b72e28a695e43da35c0fde512c68a85","examples/tsc_frequency.rs":"f5fb92a82b72d6bd8a55006d9b494da650c5bb398c0635f198616196421f243c","src/bin/cpuid.rs":"10f50c6e5d2917cea59c273b2bad439646c5ca53b8224a44c80ca30c7b378408","src/cpuid.c":"79fa0d852dba6e5e8fd1e7a0e9b8e28369818651a25bbf5d4a0c5e79320053aa","src/lib.rs":"2c6d063d1a31717c514fc9b0d2b193f049d0d9ca81d91b7bff390629eaa6e46d","src/tests.rs":"0fbdd825301037d7f6efc01ba6931e46b33d3363e27bb3c982cdb86a55c2518b"},"package":"beb71f708fe39b2c5e98076204c3cc094ee5a4c12c4cdb119a2b72dc34164f41"} \ No newline at end of file diff --git a/third_party/rust/raw-cpuid/Cargo.lock b/third_party/rust/raw-cpuid/Cargo.lock index be36a422f459..e08d9388fb5e 100644 --- a/third_party/rust/raw-cpuid/Cargo.lock +++ b/third_party/rust/raw-cpuid/Cargo.lock @@ -2,152 +2,160 @@ # It is not intended for manual editing. [[package]] name = "bitflags" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "cc" -version = "1.0.45" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" [[package]] name = "core_affinity" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8a03115cc34fb0d7c321dd154a3914b3ca082ccc5c11d91bf7117dbbe7171f" dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys", + "libc", + "num_cpus", + "winapi", +] + +[[package]] +name = "hermit-abi" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" +dependencies = [ + "libc", ] [[package]] name = "kernel32-sys" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", + "winapi-build", ] [[package]] name = "libc" -version = "0.2.62" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" [[package]] name = "num_cpus" -version = "1.10.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi", + "libc", ] [[package]] name = "proc-macro2" -version = "1.0.3" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid", ] [[package]] name = "quote" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", ] [[package]] name = "raw-cpuid" -version = "7.0.3" +version = "7.0.4" dependencies = [ - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "core_affinity 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (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.99 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "cc", + "core_affinity", + "libc", + "rustc_version", + "serde", + "serde_derive", ] [[package]] name = "rustc_version" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "semver", ] [[package]] name = "semver" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "semver-parser", ] [[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.99" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" [[package]] name = "serde_derive" -version = "1.0.99" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "syn" -version = "1.0.5" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] name = "unicode-xid" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" [[package]] name = "winapi" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" -"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" -"checksum core_affinity 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6d162c6e463c31dbf78fefa99d042156c1c74d404e299cfe3df2923cb857595b" -"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" -"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" -"checksum proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -"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.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f" -"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425" -"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/third_party/rust/raw-cpuid/Cargo.toml b/third_party/rust/raw-cpuid/Cargo.toml index 58c95d775724..727e3c865165 100644 --- a/third_party/rust/raw-cpuid/Cargo.toml +++ b/third_party/rust/raw-cpuid/Cargo.toml @@ -12,7 +12,7 @@ [package] name = "raw-cpuid" -version = "7.0.3" +version = "7.0.4" authors = ["Gerd Zellweger "] build = "build.rs" description = "A library to parse the x86 CPUID instruction, written in rust with no external dependencies. The implementation closely resembles the Intel CPUID manual description. The library does only depend on libcore." diff --git a/third_party/rust/raw-cpuid/examples/cpu.rs b/third_party/rust/raw-cpuid/examples/cpu.rs deleted file mode 100644 index d6812916b978..000000000000 --- a/third_party/rust/raw-cpuid/examples/cpu.rs +++ /dev/null @@ -1,27 +0,0 @@ -//! An example that displays the type/features/configuration of the CPU. -extern crate raw_cpuid; - -fn main() { - let cpuid = raw_cpuid::CpuId::new(); - - let vendor_string = cpuid.get_vendor_info().map_or_else( - || String::from("Unknown Vendor"), - |vf| String::from(vf.as_string()), - ); - - let brand_string: String = cpuid.get_extended_function_info().map_or_else( - || String::from("Unknown CPU"), - |extfuninfo| { - println!("{:?}", extfuninfo.extended_signature()); - String::from(extfuninfo.processor_brand_string().unwrap_or("Unknown CPU")) - }, - ); - - /*let serial_nr = cpuid.get_processor_serial().map_or_else( - || String::from(""), - |extfuninfo| String::from(extfuninfo.processor_brand_string().unwrap_or("Unknown CPU")), - );*/ - - println!("Vendor is: {}", vendor_string); - println!("CPU Model is: {}", brand_string); -} diff --git a/third_party/rust/raw-cpuid/src/lib.rs b/third_party/rust/raw-cpuid/src/lib.rs index 24ffc49b2d90..f1323870abb5 100644 --- a/third_party/rust/raw-cpuid/src/lib.rs +++ b/third_party/rust/raw-cpuid/src/lib.rs @@ -642,7 +642,7 @@ impl Iterator for CacheInfoIter { return self.next(); } - for cache_info in CACHE_INFO_TABLE.into_iter() { + for cache_info in CACHE_INFO_TABLE.iter() { if cache_info.num == byte { self.current += 1; return Some(*cache_info);