Skip to content

Fix clippy when run with --all-features #7352

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.

Sign up for GitHub

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

Merged
goto-bus-stop merged 1 commit into from
Apr 30, 2025
Merged

Fix clippy when run with --all-features #7352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 14 additions & 32 deletions apollo-router/src/executable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ use clap::Args;
use clap::Parser;
use clap::Subcommand;
use clap::builder::FalseyValueParser;
#[cfg(any(feature = "dhat-heap", feature = "dhat-ad-hoc"))]
use once_cell::sync::OnceCell;
use parking_lot::Mutex;
use regex::Captures;
use regex::Regex;
Expand Down Expand Up @@ -57,10 +55,10 @@ static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
pub(crate) static ALLOC: dhat::Alloc = dhat::Alloc;

#[cfg(feature = "dhat-heap")]
pub(crate) static mut DHAT_HEAP_PROFILER: OnceCell<dhat::Profiler> = OnceCell::new();
pub(crate) static DHAT_HEAP_PROFILER: Mutex<Option<dhat::Profiler>> = Mutex::new(None);

#[cfg(feature = "dhat-ad-hoc")]
pub(crate) static mut DHAT_AD_HOC_PROFILER: OnceCell<dhat::Profiler> = OnceCell::new();
pub(crate) static DHAT_AD_HOC_PROFILER: Mutex<Option<dhat::Profiler>> = Mutex::new(None);

pub(crate) static APOLLO_ROUTER_DEV_MODE: AtomicBool = AtomicBool::new(false);
pub(crate) static APOLLO_ROUTER_SUPERGRAPH_PATH_IS_SET: AtomicBool = AtomicBool::new(false);
Expand All @@ -76,47 +74,31 @@ const INITIAL_UPLINK_POLL_INTERVAL: Duration = Duration::from_secs(10);
// main completes, so don't use tracing, use println!() and eprintln!()..
#[cfg(feature = "dhat-heap")]
fn create_heap_profiler() {
unsafe {
match DHAT_HEAP_PROFILER.set(dhat::Profiler::new_heap()) {
Ok(p) => {
println!("heap profiler installed: {:?}", p);
libc::atexit(drop_heap_profiler);
}
Err(e) => eprintln!("heap profiler install failed: {:?}", e),
}
}
*DHAT_HEAP_PROFILER.lock() = Some(dhat::Profiler::new_heap());
println!("heap profiler installed");
unsafe { libc::atexit(drop_heap_profiler) };
}

#[cfg(feature = "dhat-heap")]
#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn drop_heap_profiler() {
unsafe {
if let Some(p) = DHAT_HEAP_PROFILER.take() {
drop(p);
}
if let Some(p) = DHAT_HEAP_PROFILER.lock().take() {
drop(p);
}
}

#[cfg(feature = "dhat-ad-hoc")]
fn create_ad_hoc_profiler() {
unsafe {
match DHAT_AD_HOC_PROFILER.set(dhat::Profiler::new_ad_hoc()) {
Ok(p) => {
println!("ad-hoc profiler installed: {:?}", p);
libc::atexit(drop_ad_hoc_profiler);
}
Err(e) => eprintln!("ad-hoc profiler install failed: {:?}", e),
}
}
*DHAT_AD_HOC_PROFILER.lock() = Some(dhat::Profiler::new_heap());
println!("ad-hoc profiler installed");
unsafe { libc::atexit(drop_ad_hoc_profiler) };
}

#[cfg(feature = "dhat-ad-hoc")]
#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn drop_ad_hoc_profiler() {
unsafe {
if let Some(p) = DHAT_AD_HOC_PROFILER.take() {
drop(p);
}
if let Some(p) = DHAT_AD_HOC_PROFILER.lock().take() {
drop(p);
}
}

Expand Down
1 change: 1 addition & 0 deletions xtask/src/commands/lint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ impl Lint {
"clippy",
"--all",
"--all-targets",
"--all-features",
"--no-deps",
"--",
"-D",
Expand Down