about summary refs log tree commit diff
path: root/src/test/rustdoc-ui
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2020-02-17 13:53:27 +0100
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2020-03-02 13:19:10 +0100
commitf1070b152546827e599cdee1f64c55faaf8bf082 (patch)
tree9c71ce5bf54bdeabffcc1c96a97d9aebd0747697 /src/test/rustdoc-ui
parent15babed8b7936e03ed4cd57afd5c91c44dc4f0be (diff)
downloadrust-f1070b152546827e599cdee1f64c55faaf8bf082.tar.gz
rust-f1070b152546827e599cdee1f64c55faaf8bf082.zip
Replace ToJson with serde
Diffstat (limited to 'src/test/rustdoc-ui')
-rw-r--r--src/test/rustdoc-ui/coverage/html.rs4
-rw-r--r--src/test/rustdoc-ui/coverage/html.stderr2
-rw-r--r--src/test/rustdoc-ui/coverage/json.rs2
-rw-r--r--src/test/rustdoc-ui/coverage/json.stdout8
-rw-r--r--src/test/rustdoc-ui/coverage/output-format-fail-check.rs4
-rw-r--r--src/test/rustdoc-ui/coverage/output-format-fail-check.stderr6
6 files changed, 18 insertions, 8 deletions
diff --git a/src/test/rustdoc-ui/coverage/html.rs b/src/test/rustdoc-ui/coverage/html.rs
new file mode 100644
index 00000000000..181cb4c5061
--- /dev/null
+++ b/src/test/rustdoc-ui/coverage/html.rs
@@ -0,0 +1,4 @@
+// compile-flags:-Z unstable-options --output-format html --show-coverage
+
+/// Foo
+pub struct Xo;
diff --git a/src/test/rustdoc-ui/coverage/html.stderr b/src/test/rustdoc-ui/coverage/html.stderr
new file mode 100644
index 00000000000..adca375d4bc
--- /dev/null
+++ b/src/test/rustdoc-ui/coverage/html.stderr
@@ -0,0 +1,2 @@
+error: html output format isn't supported for the --show-coverage option
+
diff --git a/src/test/rustdoc-ui/coverage/json.rs b/src/test/rustdoc-ui/coverage/json.rs
index 8b80244f825..b1220b32e91 100644
--- a/src/test/rustdoc-ui/coverage/json.rs
+++ b/src/test/rustdoc-ui/coverage/json.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags:-Z unstable-options --show-coverage
+// compile-flags:-Z unstable-options --output-format json --show-coverage
 
 pub mod foo {
     /// Hello!
diff --git a/src/test/rustdoc-ui/coverage/json.stdout b/src/test/rustdoc-ui/coverage/json.stdout
index be56a8c0ffa..63b22a7d94b 100644
--- a/src/test/rustdoc-ui/coverage/json.stdout
+++ b/src/test/rustdoc-ui/coverage/json.stdout
@@ -1,7 +1 @@
-+-------------------------------------+------------+------------+------------+
-| File                                | Documented |      Total | Percentage |
-+-------------------------------------+------------+------------+------------+
-| ...test/rustdoc-ui/coverage/json.rs |          7 |         13 |      53.8% |
-+-------------------------------------+------------+------------+------------+
-| Total                               |          7 |         13 |      53.8% |
-+-------------------------------------+------------+------------+------------+
+{"$DIR/json.rs":{"total":13,"with_docs":7}}
diff --git a/src/test/rustdoc-ui/coverage/output-format-fail-check.rs b/src/test/rustdoc-ui/coverage/output-format-fail-check.rs
new file mode 100644
index 00000000000..30b525df763
--- /dev/null
+++ b/src/test/rustdoc-ui/coverage/output-format-fail-check.rs
@@ -0,0 +1,4 @@
+// compile-flags:-Z unstable-options --output-format
+
+/// toudoum!
+pub struct SomeStruct;
diff --git a/src/test/rustdoc-ui/coverage/output-format-fail-check.stderr b/src/test/rustdoc-ui/coverage/output-format-fail-check.stderr
new file mode 100644
index 00000000000..9e9aa0e0501
--- /dev/null
+++ b/src/test/rustdoc-ui/coverage/output-format-fail-check.stderr
@@ -0,0 +1,6 @@
+warning: the 'output-format' flag is considered deprecated
+   |
+   = warning: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information
+
+error: too many file operands
+