Skip to content

fmt/writer: relax lifetime constrain of metadata #3375

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fmt/writer: relax lifetime constrain of metadata #3375

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
2 changes: 1 addition & 1 deletion tracing-subscriber/src/fmt/fmt_layer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@ mod test {
self.make_writer1.make_writer()
}

fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
if meta.target() == "writer2" {
return self.make_writer2.make_writer();
}
Expand Down
18 changes: 9 additions & 9 deletions tracing-subscriber/src/fmt/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ pub trait MakeWriter<'a> {
/// StdioLock::Stdout(self.stdout.lock())
/// }
///
/// fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
/// fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
/// // Here's where we can implement our special behavior. We'll
/// // check if the metadata's verbosity level is WARN or ERROR,
/// // and return stderr in that case.
Expand All @@ -202,7 +202,7 @@ pub trait MakeWriter<'a> {
/// [make_writer]: MakeWriter::make_writer
/// [`WARN`]: tracing_core::Level::WARN
/// [`ERROR`]: tracing_core::Level::ERROR
fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
let _ = meta;
self.make_writer()
}
Expand Down Expand Up @@ -778,7 +778,7 @@ impl<'a> MakeWriter<'a> for BoxMakeWriter {
}

#[inline]
fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
self.inner.make_writer_for(meta)
}
}
Expand All @@ -796,7 +796,7 @@ where
Box::new(w)
}

fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
let w = self.0.make_writer_for(meta);
Box::new(w)
}
Expand Down Expand Up @@ -950,7 +950,7 @@ impl<'a, M: MakeWriter<'a>> MakeWriter<'a> for WithMaxLevel<M> {
}

#[inline]
fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
if meta.level() <= &self.level {
return OptionalWriter::some(self.make.make_writer_for(meta));
}
Expand Down Expand Up @@ -983,7 +983,7 @@ impl<'a, M: MakeWriter<'a>> MakeWriter<'a> for WithMinLevel<M> {
}

#[inline]
fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
if meta.level() >= &self.level {
return OptionalWriter::some(self.make.make_writer_for(meta));
}
Expand Down Expand Up @@ -1023,7 +1023,7 @@ where
}

#[inline]
fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
if (self.filter)(meta) {
OptionalWriter::some(self.make.make_writer_for(meta))
} else {
Expand Down Expand Up @@ -1060,7 +1060,7 @@ where
}

#[inline]
fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
Tee::new(self.a.make_writer_for(meta), self.b.make_writer_for(meta))
}
}
Expand Down Expand Up @@ -1142,7 +1142,7 @@ where
}

#[inline]
fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
fn make_writer_for(&'a self, meta: &'static Metadata<'static>) -> Self::Writer {
match self.inner.make_writer_for(meta) {
EitherWriter::A(writer) => EitherWriter::A(writer),
EitherWriter::B(_) => EitherWriter::B(self.or_else.make_writer_for(meta)),
Expand Down