about summary refs log tree commit diff
path: root/compiler/rustc_errors/src/json
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-02-13 13:37:22 +0000
committerbors <bors@rust-lang.org>2023-02-13 13:37:22 +0000
commit0b439b119b8d49450bddbbea317afeb0d4166f70 (patch)
treec3d4ed39a42f455403c13fc1814595d389a2e9df /compiler/rustc_errors/src/json
parent2d91939bb7130a8e6c092a290b7d37f654e3c23c (diff)
parent8701e8072276dff00b799f1efe2020947d2b0d98 (diff)
downloadrust-0b439b119b8d49450bddbbea317afeb0d4166f70.tar.gz
rust-0b439b119b8d49450bddbbea317afeb0d4166f70.zip
Auto merge of #107989 - matthiaskrgr:rollup-jklrd5g, r=matthiaskrgr
Rollup of 6 pull requests

Successful merges:

 - #107340 (rustdoc: merge doctest tooltip with notable traits tooltip)
 - #107838 (Introduce `-Zterminal-urls` to use OSC8 for error codes)
 - #107922 (Print disk usage in PGO CI script)
 - #107931 (Intern span when length is MAX_LEN with parent.)
 - #107935 (rustc_ast: Merge impls and reorder methods for attributes and meta items)
 - #107986 (layout: deal with placeholders, ICE on bound types)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/json')
-rw-r--r--compiler/rustc_errors/src/json/tests.rs3
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 f131468971b..f161532d3b7 100644
--- a/compiler/rustc_errors/src/json/tests.rs
+++ b/compiler/rustc_errors/src/json/tests.rs
@@ -4,7 +4,7 @@ use crate::json::JsonEmitter;
 use rustc_span::source_map::{FilePathMapping, SourceMap};
 
 use crate::emitter::{ColorConfig, HumanReadableErrorType};
-use crate::Handler;
+use crate::{Handler, TerminalUrl};
 use rustc_span::{BytePos, Span};
 
 use std::str;
@@ -60,6 +60,7 @@ fn test_positions(code: &str, span: (u32, u32), expected_output: SpanTestData) {
             None,
             false,
             false,
+            TerminalUrl::No,
         );
 
         let span = Span::with_root_ctxt(BytePos(span.0), BytePos(span.1));