diff options
| author | bors <bors@rust-lang.org> | 2024-08-09 00:17:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-09 00:17:32 +0000 |
| commit | fac77538022b32b4298833b541feb457ca4548b0 (patch) | |
| tree | 6b0feefba5efee1b5a5c9cc1f14656181f7e16a5 /compiler/rustc_errors/src/json | |
| parent | c7b0d4e81f56da02d41f73fb5a85673a29f6cbc9 (diff) | |
| parent | 9243aeecdaa06f64bf75362227383c3f6d827cfe (diff) | |
| download | rust-fac77538022b32b4298833b541feb457ca4548b0.tar.gz rust-fac77538022b32b4298833b541feb457ca4548b0.zip | |
Auto merge of #128853 - matthiaskrgr:rollup-pr222x1, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #128640 (rwlock: disable 'frob' test in Miri on macOS) - #128791 (Don't implement `AsyncFn` for `FnDef`/`FnPtr` that wouldnt implement `Fn`) - #128806 (Split `ColorConfig` off of `HumanReadableErrorType`) - #128818 (std float tests: special-case Miri in feature detection) - #128834 (rustdoc: strip unreachable modules) - #128836 (rustdoc-json: add a test for impls on private & hidden types) - #128837 (Clippy subtree update) - #128851 (Add comment that bors did not see pushed before it merged) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/json')
| -rw-r--r-- | compiler/rustc_errors/src/json/tests.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/json/tests.rs b/compiler/rustc_errors/src/json/tests.rs index e3549fc3aa5..6af376d7afd 100644 --- a/compiler/rustc_errors/src/json/tests.rs +++ b/compiler/rustc_errors/src/json/tests.rs @@ -50,7 +50,8 @@ fn test_positions(code: &str, span: (u32, u32), expected_output: SpanTestData) { sm, fallback_bundle, true, // pretty - HumanReadableErrorType::Short(ColorConfig::Never), + HumanReadableErrorType::Short, + ColorConfig::Never, ); let span = Span::with_root_ctxt(BytePos(span.0), BytePos(span.1)); |