Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Gradient UnwindSafe on no_std on rust 1.56+ #10

Merged
merged 1 commit into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
use std::env;
use std::process::Command;
use std::str;

// The rustc-cfg strings below are *not* public API.
fn main() {
let minor = match rustc_minor_version() {
Some(minor) => minor,
None => return,
};

if minor < 56 {
println!("cargo:rustc-cfg=unwind_safe_std_only");
}
}

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;
}
pieces.next()?.parse().ok()
}
6 changes: 4 additions & 2 deletions src/gradient.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
use crate::color::Color;
use core::cmp;
use core::fmt::{self, Debug};
#[cfg(not(any(feature = "std", unwind_safe_std_only)))]
use core::panic::{RefUnwindSafe, UnwindSafe};
#[cfg(feature = "std")]
use std::panic::{RefUnwindSafe, UnwindSafe};

#[cfg(feature = "std")]
#[cfg(any(feature = "std", not(unwind_safe_std_only)))]
type DynEvalGradient = dyn EvalGradient + Send + Sync + UnwindSafe + RefUnwindSafe;
#[cfg(not(feature = "std"))]
#[cfg(all(not(feature = "std"), unwind_safe_std_only))]
type DynEvalGradient = dyn EvalGradient + Send + Sync;

#[derive(Copy, Clone)]
Expand Down