upgrade rustdoc's pulldown-cmark to 0.4.1 #60140

euclio · 2019-04-20T17:07:04Z

rust-highfive · 2019-04-20T17:07:15Z

(rust_highfive has picked a reviewer for you, use r? to override)

euclio · 2019-04-20T18:23:16Z

rust-highfive · 2019-04-20T18:53:45Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:1f3021ee:start=1555780117404612409,finish=1555780118202635702,duration=798023293
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:14:57] 
[01:14:57] running 9 tests
[01:14:57] iiiiiiiii
[01:14:57] 
[01:14:57]  finished in 0.152
[01:14:57] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:15:13] 
[01:15:13] running 121 tests
[01:15:38] .iiiii...i.....i..i...i..i.i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i. 100/121
[01:15:43] i.i......iii.i.....ii
[01:15:43] 
[01:15:43]  finished in 29.989
[01:15:43] travis_fold:end:test_debuginfo

---
[01:43:37] running 197 tests
[01:44:05] ..................i...i................................................................i............ 100/197
[01:44:49] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:517:22
[01:44:49] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:44:49] .............................................F.......i......................................i....
[01:44:49] 
[01:44:49] ---- [run-make] run-make-fulldeps/rustdoc-error-lines stdout ----
[01:44:49] 
[01:44:49] error: make failed
[01:44:49] error: make failed
[01:44:49] status: exit code: 2
[01:44:49] command: "make"
[01:44:49] stdout:
[01:44:49] ------------------------------------------
[01:44:49] make[1]: Entering directory '/checkout/src/test/run-make-fulldeps/rustdoc-error-lines'
[01:44:49] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/rustdoc-error-lines/rustdoc-error-lines:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc' -L /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib --test input.rs > /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/rustdoc-error-lines/rustdoc-error-lines/output || true
[01:44:49] "/checkout/src/etc/cat-and-grep.sh" 'input.rs:7:15' < /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/rustdoc-error-lines/rustdoc-error-lines/output
[01:44:49] [[[ begin stdout ]]]
[01:44:49] running 1 test
[01:44:49] test input.rs - foo (line 6) ... FAILED
[01:44:49] 
[01:44:49] failures:
---
[01:44:49] 
[01:44:49] error: aborting due to previous error
[01:44:49] 
[01:44:49] For more information about this error, try `rustc --explain E0308`.
[01:44:49] thread 'input.rs - foo (line 6)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:310:13
[01:44:49] 
[01:44:49] 
[01:44:49] failures:
[01:44:49]     input.rs - foo (line 6)
[01:44:49]     input.rs - foo (line 6)
[01:44:49] 
[01:44:49] test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:44:49] 
[01:44:49] 
[01:44:49] [[[ end stdout ]]]
[01:44:49] Error: cannot match: input.rs:7:15
[01:44:49] Makefile:7: recipe for target 'all' failed
[01:44:49] 
[01:44:49] ------------------------------------------
[01:44:49] stderr:
[01:44:49] ------------------------------------------
[01:44:49] ------------------------------------------
[01:44:49] make[1]: *** [all] Error 1
[01:44:49] ------------------------------------------
[01:44:49] 
[01:44:49] 
[01:44:49] 
[01:44:49] 
[01:44:49] failures:
[01:44:49]     [run-make] run-make-fulldeps/rustdoc-error-lines
[01:44:49] 
[01:44:49] test result: FAILED. 191 passed; 1 failed; 5 ignored; 0 measured; 0 filtered out
[01:44:49] 
[01:44:49] 
[01:44:49] 
[01:44:49] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/run-make-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-make" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "cc" "--cxx" "c++" "--cflags" "-ffunction-sections -fdata-sections -fPIC -m64" "--llvm-components" "aarch64 aarch64asmparser aarch64asmprinter aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils all all-targets amdgpu amdgpuasmparser amdgpuasmprinter amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armasmprinter armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter binaryformat bitreader bitwriter bpf bpfasmparser bpfasmprinter bpfcodegen bpfdesc bpfdisassembler bpfinfo codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader lanai lanaiasmparser lanaiasmprinter lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker lto mc mcdisassembler mcjit mcparser mips mipsasmparser mipsasmprinter mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmprinter msp430codegen msp430desc msp430info native nativecodegen nvptx nvptxasmprinter nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit passes powerpc powerpcasmparser powerpcasmprinter powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata runtimedyld scalaropts selectiondag sparc sparcasmparser sparcasmprinter sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzasmprinter systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target transformutils vectorize windowsmanifest x86 x86asmparser x86asmprinter x86codegen x86desc x86disassembler x86info x86utils xcore xcoreasmprinter xcorecodegen xcoredesc xcoredisassembler xcoreinfo" "--llvm-cxxflags" "-I/usr/lib/llvm-6.0/include -std=c++0x -fuse-ld=gold -Wl,--no-keep-files-mapped -Wl,--no-map-whole-files -fPIC -fvisibility-inlines-hidden -Werror=date-time -std=c++11 -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment -ffunction-sections -fdata-sections -O2 -DNDEBUG  -fno-exceptions -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" "--ar" "ar" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:44:49] 
[01:44:49] 
[01:44:49] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:44:49] Build completed unsuccessfully in 0:41:37
[01:44:49] Build completed unsuccessfully in 0:41:37
[01:44:49] make: *** [check] Error 1
[01:44:49] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:383b4b9e
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Apr 20 18:53:39 UTC 2019

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

GuillaumeGomez · 2019-04-20T19:33:56Z

Thanks for doing it! Please ping me once CI passed so I can re-review it (but currently looks good).

euclio · 2019-04-21T00:24:53Z

@GuillaumeGomez Travis is green!

GuillaumeGomez · 2019-04-21T09:06:51Z

src/librustdoc/markdown.rs

-        diag.span_warn(DUMMY_SP, &err.to_string());
-    }
+
+    find_testable_code(&input_str, &mut collector, codes);


Why those changes?

While I was making the changes to find_testable_code, I noticed that the error case isn't actually possible. The code attempts to handle a missing codeblock end event but I don't think pulldown-cmark can actually emit that sequence of events. Furthermore, there isn't a test case in the compiler that emits the error message.

So, I removed the error case, changed the signature from Result to (), and updated all the call-sites to remove the error emitting code.

I see, good catch then!

GuillaumeGomez · 2019-04-21T09:07:06Z

src/librustdoc/passes/mod.rs

-                "Documentation test in private item");
-            diag.emit();
-        }
+    find_testable_code(&dox, &mut tests, ErrorCodes::No);


Same question.

GuillaumeGomez · 2019-04-21T09:07:16Z

src/librustdoc/test.rs

-                self.sess.diagnostic().span_warn(attrs.span.unwrap_or(DUMMY_SP),
-                    &err.to_string());
-            }
+            markdown::find_testable_code(&doc, self.collector, self.codes);


Same question.

GuillaumeGomez · 2019-04-22T09:38:14Z

@bors: r+

bors · 2019-04-22T09:38:16Z

📌 Commit 2f59cf6438e65443dc94dbe3b0beec9903948e3b has been approved by GuillaumeGomez

bors · 2019-04-22T12:08:15Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout pulldown-cmark (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self pulldown-cmark --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

euclio · 2019-04-22T14:56:39Z

Rebased.

GuillaumeGomez · 2019-04-22T21:15:26Z

@bors: r+

bors · 2019-04-22T21:15:27Z

📌 Commit 3030164 has been approved by GuillaumeGomez

bors · 2019-04-23T00:45:04Z

⌛ Testing commit 3030164 with merge 0550766...

upgrade rustdoc's pulldown-cmark to 0.4.1 Fixes #59194.

bors · 2019-04-23T03:34:07Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: GuillaumeGomez
Pushing 0550766 to master...

rust-highfive assigned alexcrichton Apr 20, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 20, 2019

rust-highfive assigned GuillaumeGomez and unassigned alexcrichton Apr 20, 2019

euclio force-pushed the pulldown-cmark branch from 7535844 to 2f59cf6 Compare April 20, 2019 22:09

GuillaumeGomez reviewed Apr 21, 2019

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 22, 2019

upgrade rustdoc's pulldown-cmark to 0.4.1

3030164

euclio force-pushed the pulldown-cmark branch from 2f59cf6 to 3030164 Compare April 22, 2019 14:55

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 22, 2019

bors added a commit that referenced this pull request Apr 23, 2019

Auto merge of #60140 - euclio:pulldown-cmark, r=GuillaumeGomez

0550766

upgrade rustdoc's pulldown-cmark to 0.4.1 Fixes #59194.

bors mentioned this pull request Apr 23, 2019

Fix sync_all on macos/ios #60121

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 23, 2019

bors merged commit 3030164 into rust-lang:master Apr 23, 2019

This was referenced Apr 23, 2019

Add rustc guide to toolstate #59772

Merged

Fix index-page generation #60134

Merged

euclio mentioned this pull request Apr 27, 2019

Empty doc tests should be linted #60319

Closed

euclio deleted the pulldown-cmark branch April 27, 2019 03:55

jonas-schievink mentioned this pull request May 2, 2019

nightly cargo doc panics in font8x8 crate #60482

Closed

QuietMisdreavus mentioned this pull request Jun 6, 2019

regression: doctest failure display-as-0.4.4 #61562

Closed

Cldfire mentioned this pull request Jul 11, 2019

Paragraphs in block doc comments are broken #62552

Closed

tesuji mentioned this pull request Oct 14, 2020

ICE: Encountered errors [FulfillmentError(Obligation(predicate=TraitPredicate(<Five as TypeVal<[type error]>>), depth=1),Ambiguity)] resolving bounds after type-checking #77919

Closed

upgrade rustdoc's pulldown-cmark to 0.4.1 #60140

upgrade rustdoc's pulldown-cmark to 0.4.1 #60140

Uh oh!

Conversation

euclio commented Apr 20, 2019

Uh oh!

rust-highfive commented Apr 20, 2019

Uh oh!

euclio commented Apr 20, 2019

Uh oh!

rust-highfive commented Apr 20, 2019

Uh oh!

GuillaumeGomez commented Apr 20, 2019

Uh oh!

euclio commented Apr 21, 2019

Uh oh!

GuillaumeGomez Apr 21, 2019

Choose a reason for hiding this comment

Uh oh!

euclio Apr 21, 2019

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez Apr 22, 2019

Choose a reason for hiding this comment

Uh oh!

phrohdoh Apr 27, 2019

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez Apr 21, 2019

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez Apr 21, 2019

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez commented Apr 22, 2019

Uh oh!

bors commented Apr 22, 2019

Uh oh!

bors commented Apr 22, 2019

Uh oh!

euclio commented Apr 22, 2019

Uh oh!

GuillaumeGomez commented Apr 22, 2019

Uh oh!

bors commented Apr 22, 2019

Uh oh!

bors commented Apr 23, 2019

Uh oh!

bors commented Apr 23, 2019

Uh oh!

Uh oh!