Skip to content
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

Tracing cleanup #101239

Merged
merged 4 commits into from
Sep 1, 2022
Merged

Tracing cleanup #101239

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3b22c7
Directly use the `instrument` macro instead of its full path
oli-obk Aug 31, 2022
ee3c835
Always import all tracing macros for the entire crate instead of piec…
oli-obk Aug 31, 2022
1fc9ef1
tracing::instrument cleanup
oli-obk Jun 28, 2022
3f1f694
Adjust stderr file
oli-obk Aug 31, 2022
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
Prev Previous commit
Adjust stderr file
  • Loading branch information
@oli-obk
oli-obk committed Sep 1, 2022
commit 3f1f694ca5845131782d69f0598b0f6e5b3ae3d5
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/session-diagnostic/diagnostic-derive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Tests error conditions for specifying diagnostics using #[derive(SessionDiagnostic)]

// normalize-stderr-test "the following other types implement trait `IntoDiagnosticArg`:(?:.*\n){0,9}\s+and \d+ others" -> "normalized in stderr"

// normalize-stderr-test "diagnostic_builder\.rs:[0-9]+:[0-9]+" -> "diagnostic_builder.rs:LL:CC"
// The proc_macro2 crate handles spans differently when on beta/stable release rather than nightly,
// changing the output of this test. Since SessionDiagnostic is strictly internal to the compiler
// the test is just ignored on stable and beta:
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ LL | #[derive(SessionDiagnostic)]
|
= help: normalized in stderr
note: required by a bound in `DiagnosticBuilder::<'a, G>::set_arg`
--> $COMPILER_DIR/rustc_errors/src/diagnostic_builder.rs:569:19
--> $COMPILER_DIR/rustc_errors/src/diagnostic_builder.rs:LL:CC
|
LL | arg: impl IntoDiagnosticArg,
| ^^^^^^^^^^^^^^^^^ required by this bound in `DiagnosticBuilder::<'a, G>::set_arg`
Expand Down