diff options
| author | Michael Goulet <michael@errs.io> | 2023-02-08 20:01:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 20:01:25 -0800 |
| commit | 32bb73eedef784a3a4a3225805e0977014cd5c72 (patch) | |
| tree | c606c24a7b6e337da12e23bde88b383ce582c178 /tests | |
| parent | 04f770839d66d6881af44e28de69589dd6f8133e (diff) | |
| parent | f95b553eb4b6a2a0bf45e48c0cc5e9f635ba1e0c (diff) | |
| download | rust-32bb73eedef784a3a4a3225805e0977014cd5c72.tar.gz rust-32bb73eedef784a3a4a3225805e0977014cd5c72.zip | |
Rollup merge of #107761 - oli-obk:miri_🪵, r=TaKO8Ki
Replace a command line flag with an env var to allow tools to initialize the tracing loggers at their own discretion fixes https://github.com/rust-lang/miri/issues/2778 this was introduced in https://github.com/rust-lang/rust/pull/104645, so this PR reverts the flag-part and uses an env var instead.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rustdoc-ui/z-help.stdout | 1 | ||||
| -rw-r--r-- | tests/ui/attributes/log-backtrace.rs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/rustdoc-ui/z-help.stdout b/tests/rustdoc-ui/z-help.stdout index 4f07fca82d1..706db892cb3 100644 --- a/tests/rustdoc-ui/z-help.stdout +++ b/tests/rustdoc-ui/z-help.stdout @@ -77,7 +77,6 @@ -Z llvm-plugins=val -- a list LLVM plugins to enable (space separated) -Z llvm-time-trace=val -- generate JSON tracing data file from LLVM data (default: no) -Z location-detail=val -- what location details should be tracked when using caller_location, either `none`, or a comma separated list of location details, for which valid options are `file`, `line`, and `column` (default: `file,line,column`) - -Z log-backtrace=val -- add a backtrace along with logging -Z ls=val -- list the symbols defined by a library crate (default: no) -Z macro-backtrace=val -- show macro backtraces (default: no) -Z maximal-hir-to-mir-coverage=val -- save as much information as possible about the correspondence between MIR and HIR as source scopes (default: no) diff --git a/tests/ui/attributes/log-backtrace.rs b/tests/ui/attributes/log-backtrace.rs index 3979d2001fc..e42edf1d4af 100644 --- a/tests/ui/attributes/log-backtrace.rs +++ b/tests/ui/attributes/log-backtrace.rs @@ -1,9 +1,9 @@ // run-pass // -// This test makes sure that log-backtrace option doesn't give a compilation error. +// This test makes sure that log-backtrace option at least parses correctly // // dont-check-compiler-stdout // dont-check-compiler-stderr // rustc-env:RUSTC_LOG=info -// compile-flags: -Zlog-backtrace=rustc_metadata::creader +// rustc-env:RUSTC_LOG_BACKTRACE=rustc_metadata::creader fn main() {} |