Browse Source

Merge pull request #2603 from cfallin/fix-cpuid

Fix cargo-deny issue with raw-cpuid advisory.
pull/2601/head
Chris Fallin 4 years ago
committed by GitHub
parent
commit
443fac69e5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 30
      Cargo.lock
  2. 7
      cranelift/native/Cargo.toml

30
Cargo.lock

@ -2147,13 +2147,11 @@ dependencies = [
[[package]]
name = "raw-cpuid"
version = "8.1.2"
version = "9.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73"
checksum = "c27cb5785b85bd05d4eb171556c9a1a514552e26123aeae6bb7d811353148026"
dependencies = [
"bitflags",
"cc",
"rustc_version",
]
[[package]]
@ -2350,15 +2348,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc_version"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
dependencies = [
"semver",
]
[[package]]
name = "rusty-fork"
version = "0.3.0"
@ -2412,21 +2401,6 @@ dependencies = [
"syn",
]
[[package]]
name = "semver"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
dependencies = [
"semver-parser",
]
[[package]]
name = "semver-parser"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
version = "1.0.120"

7
cranelift/native/Cargo.toml

@ -15,15 +15,12 @@ cranelift-codegen = { path = "../codegen", version = "0.69.0", default-features
target-lexicon = "0.11"
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
raw-cpuid = "8.1.2"
raw-cpuid = "9.0.0"
[features]
default = ["std"]
std = ["cranelift-codegen/std"]
# when compiling with the "core" feature, nightly must be enabled
# enabling the "nightly" feature for raw-cpuid allows avoiding
# linking in a c-library.
core = ["cranelift-codegen/core", "raw-cpuid/nightly"]
core = ["cranelift-codegen/core"]
[badges]
maintenance = { status = "experimental" }

Loading…
Cancel
Save