corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1948842 - Remove mozglue code specific to rust < 1.82. r=firefox-build-system-reviewers,sergesanspaille

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D238562
This commit is contained in:
Mike Hommey
2025-02-25 20:55:08 +00:00
parent 2300895022
commit 8bca5e74c0
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozglue/static/rust/build.rs
View File

@@ -21,16 +21,8 @@ fn main() {
// code in tree, but the version here is such that it's effectively never used. // code in tree, but the version here is such that it's effectively never used.
let max_alloc_error_panic_version = Version::parse("1.88.0-alpha").unwrap(); let max_alloc_error_panic_version = Version::parse("1.88.0-alpha").unwrap();
if ver >= Version::parse("1.80.0-alpha").unwrap() {
println!("cargo::rustc-check-cfg=cfg(has_panic_hook_info)"); println!("cargo::rustc-check-cfg=cfg(has_panic_hook_info)");
println!("cargo::rustc-check-cfg=cfg(oom_with, values(\"hook\", \"alloc_error_panic\"))"); println!("cargo::rustc-check-cfg=cfg(oom_with, values(\"hook\", \"alloc_error_panic\"))");
}
// As of 1.81, std::panic::PanicInfo is deprecated and replaced by
// std::panic::PanicHookInfo. Using the former becomes a warning in
// 1.82, but we can use the new type as of 1.81.
if ver >= Version::parse("1.81.0-beta").unwrap() {
println!("cargo:rustc-cfg=has_panic_hook_info");
}
if ver < max_oom_hook_version { if ver < max_oom_hook_version {
println!("cargo:rustc-cfg=oom_with=\"hook\""); println!("cargo:rustc-cfg=oom_with=\"hook\"");
} else if ver < max_alloc_error_panic_version { } else if ver < max_alloc_error_panic_version {

3
mozglue/static/rust/lib.rs
View File

@@ -13,10 +13,7 @@ use std::os::raw::c_char;
use std::os::raw::c_int; use std::os::raw::c_int;
use std::os::raw::c_void; use std::os::raw::c_void;
use std::panic; use std::panic;
#[cfg(has_panic_hook_info)]
use std::panic::PanicHookInfo; use std::panic::PanicHookInfo;
#[cfg(not(has_panic_hook_info))]
use std::panic::PanicInfo as PanicHookInfo;
#[link(name = "wrappers")] #[link(name = "wrappers")]
extern "C" { extern "C" {