Skip to content

Fix invalid/outdated #[cfg()] values #2971

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

Closed
Xiretza wants to merge 3 commits into from
Closed

Fix invalid/outdated #[cfg()] values #2971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ad116b
tracing-tower: replace tower-util with tower_make
Xiretza May 15, 2024
b1a83fb
tracing-futures: remove traces of futures_preview
Xiretza May 15, 2024
1aa0e35
tracing-subscriber: fix feature name for nu-ansi-term
Xiretza May 15, 2024
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
121 changes: 0 additions & 121 deletions tracing-futures/src/executor/futures_preview.rs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions tracing-futures/src/executor/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
#[cfg(feature = "futures-01")]
mod futures_01;

#[cfg(feature = "futures_preview")]
mod futures_preview;
#[cfg(feature = "futures_preview")]
pub use self::futures_preview::*;

#[cfg(feature = "futures-03")]
mod futures_03;
#[cfg(feature = "futures-03")]
Expand Down
14 changes: 7 additions & 7 deletions tracing-subscriber/src/filter/env/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,15 @@ impl Builder {
}

if !disabled.is_empty() {
#[cfg(feature = "nu_ansi_term")]
#[cfg(feature = "nu-ansi-term")]
use nu_ansi_term::{Color, Style};
// NOTE: We can't use a configured `MakeWriter` because the EnvFilter
// has no knowledge of any underlying subscriber or collector, which
// may or may not use a `MakeWriter`.
let warn = |msg: &str| {
#[cfg(not(feature = "nu_ansi_term"))]
#[cfg(not(feature = "nu-ansi-term"))]
let msg = format!("warning: {}", msg);
#[cfg(feature = "nu_ansi_term")]
#[cfg(feature = "nu-ansi-term")]
let msg = {
let bold = Style::new().bold();
let mut warning = Color::Yellow.paint("warning");
Expand All @@ -228,9 +228,9 @@ impl Builder {
eprintln!("{}", msg);
};
let ctx_prefixed = |prefix: &str, msg: &str| {
#[cfg(not(feature = "nu_ansi_term"))]
#[cfg(not(feature = "nu-ansi-term"))]
let msg = format!("{} {}", prefix, msg);
#[cfg(feature = "nu_ansi_term")]
#[cfg(feature = "nu-ansi-term")]
let msg = {
let mut equal = Color::Fixed(21).paint("="); // dark blue
equal.style_ref_mut().is_bold = true;
Expand All @@ -241,9 +241,9 @@ impl Builder {
let ctx_help = |msg| ctx_prefixed("help:", msg);
let ctx_note = |msg| ctx_prefixed("note:", msg);
let ctx = |msg: &str| {
#[cfg(not(feature = "nu_ansi_term"))]
#[cfg(not(feature = "nu-ansi-term"))]
let msg = format!("note: {}", msg);
#[cfg(feature = "nu_ansi_term")]
#[cfg(feature = "nu-ansi-term")]
let msg = {
let mut pipe = Color::Fixed(21).paint("|");
pipe.style_ref_mut().is_bold = true;
Expand Down
12 changes: 6 additions & 6 deletions tracing-tower/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ where
}
}

#[cfg(feature = "tower-util")]
#[cfg_attr(docsrs, doc(cfg(feature = "tower-util")))]
#[cfg(feature = "tower_make")]
#[cfg_attr(docsrs, doc(cfg(feature = "tower_make")))]
pub trait InstrumentMake<T, R>
where
Self: tower_util::MakeService<T, R> + Sized,
Self: tower_make::MakeService<T, R> + Sized,
{
fn with_traced_service<G>(self, get_span: G) -> service_span::MakeService<Self, T, R, G>
where
Expand All @@ -94,9 +94,9 @@ where

impl<S, R> InstrumentableService<R> for S where S: Service<R> + Sized {}

#[cfg(feature = "tower-util")]
#[cfg_attr(docsrs, doc(cfg(feature = "tower-util")))]
impl<M, T, R> InstrumentMake<T, R> for M where M: tower_util::MakeService<T, R> {}
#[cfg(feature = "tower_make")]
#[cfg_attr(docsrs, doc(cfg(feature = "tower_make")))]
impl<M, T, R> InstrumentMake<T, R> for M where M: tower_make::MakeService<T, R> {}

pub trait GetSpan<T>: crate::sealed::Sealed<T> {
fn span_for(&self, target: &T) -> tracing::Span;
Expand Down
4 changes: 2 additions & 2 deletions tracing-tower/src/service_span.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ pub struct Service<S> {
#[cfg_attr(docsrs, doc(cfg(feature = "tower-layer")))]
pub use self::layer::*;

#[cfg(feature = "tower-util")]
#[cfg_attr(docsrs, doc(cfg(feature = "tower-util")))]
#[cfg(feature = "tower_make")]
#[cfg_attr(docsrs, doc(cfg(feature = "tower_make")))]
pub use self::make::MakeService;

#[cfg(feature = "tower-layer")]
Expand Down