Skip to content

Commit 7743599

Browse files
committed
Auto merge of #340 - kamalmarhubi:allow-raw-pointer-derive-warning, r=posborne
Fix raw_pointer_derive warning This commit adds a small build script to detect if we need to `#[allow(raw_pointer_derive)]` and makes the attribute conditional. Refs #337
2 parents 4ca407d + 7c9524c commit 7743599

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ exclude = [
1313
"test/**/*"
1414
]
1515

16+
build = "build.rs"
17+
1618
[features]
1719
eventfd = []
1820
execvpe = []
@@ -24,6 +26,10 @@ libc = "0.2.8"
2426
bitflags = "0.4"
2527
cfg-if = "0.1.0"
2628

29+
[build-dependencies]
30+
rustc_version = "0.1.7"
31+
semver = "0.1.20" # Old version for compatibility with rustc_version.
32+
2733
[dev-dependencies]
2834
rand = "0.3.8"
2935
tempdir = "0.3"

build.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
extern crate rustc_version;
2+
extern crate semver;
3+
4+
use semver::Version;
5+
6+
fn main() {
7+
if rustc_version::version() >= Version::parse("1.6.0").unwrap() {
8+
println!("cargo:rustc-cfg=raw_pointer_derive_allowed");
9+
}
10+
}

src/sys/signal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl AsRef<libc::sigset_t> for SigSet {
154154
}
155155

156156
#[allow(unknown_lints)]
157-
#[allow(raw_pointer_derive)]
157+
#[cfg_attr(not(raw_pointer_derive_allowed), allow(raw_pointer_derive))]
158158
#[derive(Clone, Copy, PartialEq)]
159159
pub enum SigHandler {
160160
SigDfl,

0 commit comments

Comments
 (0)