From 8491f4b08594726b6ae376296b3d342fef394363 Mon Sep 17 00:00:00 2001 From: Ian Ker-Seymer Date: Wed, 12 Jul 2023 01:14:19 -0400 Subject: [PATCH] Do not use slice::as_ptr --- crates/rb-sys-build/src/utils.rs | 38 ------------------------ crates/rb-sys/src/stable_api/ruby_2_6.rs | 2 +- crates/rb-sys/src/stable_api/ruby_2_7.rs | 2 +- crates/rb-sys/src/stable_api/ruby_3_0.rs | 2 +- crates/rb-sys/src/stable_api/ruby_3_1.rs | 2 +- crates/rb-sys/src/stable_api/ruby_3_2.rs | 2 +- 6 files changed, 5 insertions(+), 43 deletions(-) diff --git a/crates/rb-sys-build/src/utils.rs b/crates/rb-sys-build/src/utils.rs index 428d3fc0..a11e7a27 100644 --- a/crates/rb-sys-build/src/utils.rs +++ b/crates/rb-sys-build/src/utils.rs @@ -18,24 +18,6 @@ pub fn is_mswin_or_mingw() -> bool { } } -/// Check if we are in debug mode. -pub fn is_debug_env() -> bool { - if std::env::var("CARGO_CFG_FEATURE") - .map(|ft| ft.contains("clippy")) - .unwrap_or(false) - { - return false; - } - - let vars_to_check = ["DEBUG", "RB_SYS_DEBUG", "RB_SYS_DEBUG_BUILD"]; - - vars_to_check.iter().any(|var| { - std::env::var(var) - .map(|v| v == "1" || v == "true") - .unwrap_or(false) - }) -} - /// Splits shell words. pub fn shellsplit>(s: S) -> Vec { let s = s.as_ref(); @@ -66,25 +48,5 @@ macro_rules! memoize { macro_rules! debug_log { ($($arg:tt)*) => { eprintln!($($arg)*); - - if $crate::utils::is_debug_env() { - use std::io::Write; - - let dir = if let Ok(dir) = std::env::var("DEBUG_OUTPUT_DIR") { - std::path::PathBuf::from(dir) - } else { - std::env::var("CARGO_MANIFEST_DIR") - .map(|dir| std::path::PathBuf::from(dir)) - .unwrap_or_else(|_| std::env::current_dir().unwrap()) - }; - - let mut file = std::fs::OpenOptions::new() - .create(true) - .append(true) - .open(dir.join("rb-sys-build.log")) - .unwrap(); - - let _ = writeln!(file, $($arg)*); - } }; } diff --git a/crates/rb-sys/src/stable_api/ruby_2_6.rs b/crates/rb-sys/src/stable_api/ruby_2_6.rs index 59575298..0cd667e4 100644 --- a/crates/rb-sys/src/stable_api/ruby_2_6.rs +++ b/crates/rb-sys/src/stable_api/ruby_2_6.rs @@ -37,7 +37,7 @@ impl StableApiDefinition for Definition { let is_heap = (flags & RSTRING_NOEMBED as VALUE) != 0; if !is_heap { - rstring.as_.ary.as_ptr() as *const _ + &rstring.as_.ary as *const _ } else { rstring.as_.heap.ptr } diff --git a/crates/rb-sys/src/stable_api/ruby_2_7.rs b/crates/rb-sys/src/stable_api/ruby_2_7.rs index ddcd8d6f..2231063b 100644 --- a/crates/rb-sys/src/stable_api/ruby_2_7.rs +++ b/crates/rb-sys/src/stable_api/ruby_2_7.rs @@ -37,7 +37,7 @@ impl StableApiDefinition for Definition { let is_heap = (flags & crate::ruby_rstring_flags::RSTRING_NOEMBED as VALUE) != 0; if !is_heap { - rstring.as_.ary.as_ptr() as *const _ + &rstring.as_.ary as *const _ } else { rstring.as_.heap.ptr } diff --git a/crates/rb-sys/src/stable_api/ruby_3_0.rs b/crates/rb-sys/src/stable_api/ruby_3_0.rs index 845766f2..bb796daf 100644 --- a/crates/rb-sys/src/stable_api/ruby_3_0.rs +++ b/crates/rb-sys/src/stable_api/ruby_3_0.rs @@ -40,7 +40,7 @@ impl StableApiDefinition for Definition { let is_heap = (flags & crate::ruby_rstring_flags::RSTRING_NOEMBED as VALUE) != 0; if !is_heap { - rstring.as_.ary.as_ptr() as *const _ + &rstring.as_.ary as *const _ } else { rstring.as_.heap.ptr } diff --git a/crates/rb-sys/src/stable_api/ruby_3_1.rs b/crates/rb-sys/src/stable_api/ruby_3_1.rs index b7e74fa0..16ab1604 100644 --- a/crates/rb-sys/src/stable_api/ruby_3_1.rs +++ b/crates/rb-sys/src/stable_api/ruby_3_1.rs @@ -37,7 +37,7 @@ impl StableApiDefinition for Definition { let is_heap = (flags & crate::ruby_rstring_flags::RSTRING_NOEMBED as VALUE) != 0; if !is_heap { - rstring.as_.embed.ary.as_ptr() as *const c_char + &rstring.as_.embed.ary as *const _ } else { rstring.as_.heap.ptr } diff --git a/crates/rb-sys/src/stable_api/ruby_3_2.rs b/crates/rb-sys/src/stable_api/ruby_3_2.rs index 104523ea..40d60e4d 100644 --- a/crates/rb-sys/src/stable_api/ruby_3_2.rs +++ b/crates/rb-sys/src/stable_api/ruby_3_2.rs @@ -32,7 +32,7 @@ impl StableApiDefinition for Definition { let is_heap = (flags & crate::ruby_rstring_flags::RSTRING_NOEMBED as VALUE) != 0; if !is_heap { - rstring.as_.embed.ary.as_ptr() as *const c_char + &rstring.as_.embed.ary as *const _ } else { rstring.as_.heap.ptr }