Skip to content

Commit 3a1f571

Browse files
authored
Fix CI (#3361)
* Implement PartialOrd for MatchPattern, MatchDebug in terms of Ord * Fix missing link to supported regex syntax * Update expected trybuild output * Fix tracing_subscriber::Layer links
1 parent e63ef57 commit 3a1f571

File tree

5 files changed

+8
-14
lines changed

5 files changed

+8
-14
lines changed

tracing-attributes/tests/ui/fail/async_instrument.stderr

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,14 @@ error[E0277]: `(&str,)` doesn't implement `std::fmt::Display`
3333
16 | | }
3434
| | ^
3535
| | |
36-
| |_`(&str,)` cannot be formatted with the default formatter
36+
| |_the trait `std::fmt::Display` is not implemented for `(&str,)`
3737
| return type was inferred to be `(&str,)` here
38-
|
39-
= help: the trait `std::fmt::Display` is not implemented for `(&str,)`
40-
= note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
4138

4239
error[E0277]: `(&str,)` doesn't implement `std::fmt::Display`
4340
--> tests/ui/fail/async_instrument.rs:14:34
4441
|
4542
14 | async fn opaque_unsatisfied() -> impl std::fmt::Display {
46-
| ^^^^^^^^^^^^^^^^^^^^^^ `(&str,)` cannot be formatted with the default formatter
47-
|
48-
= help: the trait `std::fmt::Display` is not implemented for `(&str,)`
49-
= note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
43+
| ^^^^^^^^^^^^^^^^^^^^^^ the trait `std::fmt::Display` is not implemented for `(&str,)`
5044

5145
error[E0308]: mismatched types
5246
--> tests/ui/fail/async_instrument.rs:22:5

tracing-journald/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ preserving structured information.
2424

2525
[`tracing`] is a framework for instrumenting Rust programs to collect
2626
scoped, structured, and async-aware diagnostics. `tracing-journald` provides a
27-
[`tracing-subscriber::Layer`][layer] implementation for logging `tracing` spans
27+
[`tracing_subscriber::Layer`][layer] implementation for logging `tracing` spans
2828
and events to [`systemd-journald`][journald], on Linux distributions that use
2929
`systemd`.
3030

tracing-journald/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//!
88
//! [`tracing`] is a framework for instrumenting Rust programs to collect
99
//! scoped, structured, and async-aware diagnostics. `tracing-journald` provides a
10-
//! [`tracing-subscriber::Layer`] implementation for logging `tracing` spans
10+
//! [`tracing_subscriber::Layer`] implementation for logging `tracing` spans
1111
//! and events to [`systemd-journald`][journald], on Linux distributions that
1212
//! use `systemd`.
1313
//!

tracing-subscriber/src/filter/env/field.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ impl Eq for MatchPattern {}
334334
impl PartialOrd for MatchPattern {
335335
#[inline]
336336
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
337-
Some(self.pattern.cmp(&other.pattern))
337+
Some(self.cmp(other))
338338
}
339339
}
340340

@@ -430,7 +430,7 @@ impl Eq for MatchDebug {}
430430
impl PartialOrd for MatchDebug {
431431
#[inline]
432432
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
433-
Some(self.pattern.cmp(&other.pattern))
433+
Some(self.cmp(other))
434434
}
435435
}
436436

tracing-subscriber/src/filter/env/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ use tracing_core::{
7878
/// instead.
7979
///
8080
/// When field value filters are interpreted as regular expressions, the
81-
/// [`regex-automata` crate's regular expression syntax][re-syntax] is
82-
/// supported.
81+
/// [`regex` crate's regular expression syntax][re-syntax] is supported.
8382
///
8483
/// **Note**: When filters are constructed from potentially untrusted inputs,
8584
/// [disabling regular expression matching](Builder::with_regex) is strongly
@@ -192,6 +191,7 @@ use tracing_core::{
192191
/// [global]: crate::layer#global-filtering
193192
/// [plf]: crate::layer#per-layer-filtering
194193
/// [filtering]: crate::layer#filtering-with-layers
194+
/// [re-syntax]: https://docs.rs/regex/1.11.1/regex/#syntax
195195
#[cfg_attr(docsrs, doc(cfg(all(feature = "env-filter", feature = "std"))))]
196196
#[derive(Debug)]
197197
pub struct EnvFilter {

0 commit comments

Comments
 (0)