diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2024-02-05 23:53:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-05 23:53:18 +0000 |
commit | ab3436461b12acbbafa7e02f308418ea5ef97bb9 (patch) | |
tree | 04bb9065d05304dd095523bc84293fdeb99bb362 /build.rs | |
parent | 7bc073578eb747024e07fbd7afbb136413ea9c5f (diff) | |
parent | 85f2728d9e2c6040ac3a800ee9d30d6c331f3190 (diff) | |
download | serde_json-ab3436461b12acbbafa7e02f308418ea5ef97bb9.tar.gz |
Upgrade serde_json to 1.0.113 am: 85f2728d9e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/2949322
Change-Id: I4a9b865abd6fdd0906b57ec406f72a83c11d6936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'build.rs')
-rw-r--r-- | build.rs | 39 |
1 files changed, 1 insertions, 38 deletions
@@ -1,6 +1,4 @@ use std::env; -use std::process::Command; -use std::str::{self, FromStr}; fn main() { println!("cargo:rerun-if-changed=build.rs"); @@ -9,46 +7,11 @@ fn main() { // src/lexical/math.rs for where this has an effect. let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap(); match target_arch.as_str() { - "aarch64" | "mips64" | "powerpc64" | "x86_64" => { + "aarch64" | "mips64" | "powerpc64" | "x86_64" | "loongarch64" => { println!("cargo:rustc-cfg=limb_width_64"); } _ => { println!("cargo:rustc-cfg=limb_width_32"); } } - - let minor = match rustc_minor_version() { - Some(minor) => minor, - None => return, - }; - - // BTreeMap::get_key_value - // https://blog.rust-lang.org/2019/12/19/Rust-1.40.0.html#additions-to-the-standard-library - if minor < 40 { - println!("cargo:rustc-cfg=no_btreemap_get_key_value"); - } - - // BTreeMap::remove_entry - // https://blog.rust-lang.org/2020/07/16/Rust-1.45.0.html#library-changes - if minor < 45 { - println!("cargo:rustc-cfg=no_btreemap_remove_entry"); - } - - // BTreeMap::retain - // https://blog.rust-lang.org/2021/06/17/Rust-1.53.0.html#stabilized-apis - if minor < 53 { - println!("cargo:rustc-cfg=no_btreemap_retain"); - } -} - -fn rustc_minor_version() -> Option<u32> { - let rustc = env::var_os("RUSTC")?; - let output = Command::new(rustc).arg("--version").output().ok()?; - let version = str::from_utf8(&output.stdout).ok()?; - let mut pieces = version.split('.'); - if pieces.next() != Some("rustc 1") { - return None; - } - let next = pieces.next()?; - u32::from_str(next).ok() } |