about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAndy Russell <arussell123@gmail.com>2019-04-20 13:03:59 -0400
committerAndy Russell <arussell123@gmail.com>2019-04-22 09:11:26 -0400
commit303016485b63aeeaa4ad00a2102150badad3b289 (patch)
tree828ec497f28e69f21d301cc22e7e8a9559078004 /src/test
parenta850a426491e14186af2250549bf41256b5938d2 (diff)
downloadrust-303016485b63aeeaa4ad00a2102150badad3b289.tar.gz
rust-303016485b63aeeaa4ad00a2102150badad3b289.zip
upgrade rustdoc's pulldown-cmark to 0.4.1
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-make-fulldeps/rustdoc-error-lines/Makefile5
-rw-r--r--src/test/run-make-fulldeps/rustdoc-error-lines/input.rs17
2 files changed, 22 insertions, 0 deletions
diff --git a/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile b/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile
index e09343aa937..c9d41f0ec3b 100644
--- a/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile
+++ b/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile
@@ -5,4 +5,9 @@
 
 all:
 	$(RUSTDOC) --test input.rs > $(TMPDIR)/output || true
+	$(CGREP) 'input.rs - foo (line 5)' < $(TMPDIR)/output
 	$(CGREP) 'input.rs:7:15' < $(TMPDIR)/output
+	$(CGREP) 'input.rs - bar (line 15)' < $(TMPDIR)/output
+	$(CGREP) 'input.rs:17:15' < $(TMPDIR)/output
+	$(CGREP) 'input.rs - bar (line 24)' < $(TMPDIR)/output
+	$(CGREP) 'input.rs:26:15' < $(TMPDIR)/output
diff --git a/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs b/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs
index 7b07f38f259..2d29fa89110 100644
--- a/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs
+++ b/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs
@@ -9,3 +9,20 @@
 pub fn foo() {
 
 }
+
+/// Add some text around the test...
+///
+/// ```rust
+/// #![feature(nll)]
+/// let x: char = 1;
+/// ```
+///
+/// ...to make sure that the line number is still correct.
+///
+/// Let's also add a second test in the same doc comment.
+///
+/// ```rust
+/// #![feature(nll)]
+/// let x: char = 1;
+/// ```
+pub fn bar() {}