Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pulldown-cmark version #59349

Closed
wants to merge 2 commits into from

Conversation

GuillaumeGomez
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 21, 2019
@rust-highfive
Copy link
Collaborator

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:13dda8d2:start=1553204875517677854,finish=1553204876500656716,duration=982978862
$ 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
Setting environment variables from .travis.yml
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:21:36] 
[01:21:36] running 9 tests
[01:21:36] iiiiiiiii
[01:21:36] 
[01:21:36]  finished in 0.160
[01:21:36] 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:21:53] 
[01:21:53] running 120 tests
[01:22:19] .iiiii...i.....i..i...i..i.i...i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i 100/120
[01:22:23] .i......iii.i.....ii
[01:22:23] 
[01:22:23]  finished in 30.335
[01:22:23] travis_fold:end:test_debuginfo

---
[01:48:46] travis_fold:end:stage0-linkchecker

[01:48:46] travis_time:end:stage0-linkchecker:start=1553211411394143856,finish=1553211413371107825,duration=1976963969

[01:48:50] std/sync/atomic/struct.AtomicIsize.html:4: absolute path - /checkout/src/libcore/std/primitive.isize.html
[01:48:50] std/sync/atomic/struct.AtomicUsize.html:4: absolute path - /checkout/src/libcore/std/primitive.usize.html
[01:48:50] std/sync/atomic/struct.AtomicU32.html:4: absolute path - /checkout/src/libcore/std/primitive.u32.html
[01:48:50] std/sync/atomic/struct.AtomicI64.html:4: absolute path - /checkout/src/libcore/std/primitive.i64.html
[01:48:50] std/sync/atomic/struct.AtomicI32.html:4: absolute path - /checkout/src/libcore/std/primitive.i32.html
[01:48:50] std/sync/atomic/struct.AtomicU64.html:4: absolute path - /checkout/src/libcore/std/primitive.u64.html
[01:48:50] std/sync/atomic/struct.AtomicU8.html:4: absolute path - /checkout/src/libcore/std/primitive.u8.html
[01:48:50] std/sync/atomic/struct.AtomicU16.html:4: absolute path - /checkout/src/libcore/std/primitive.u16.html
[01:48:50] std/sync/atomic/struct.AtomicI16.html:4: absolute path - /checkout/src/libcore/std/primitive.i16.html
[01:48:50] std/sync/atomic/struct.AtomicI8.html:4: absolute path - /checkout/src/libcore/std/primitive.i8.html
[01:48:54] thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:41:9
[01:48:54] 
[01:48:54] 
[01:48:54] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
[01:48:54] expected success, got: exit code: 101
[01:48:54] expected success, got: exit code: 101
[01:48:54] 
[01:48:54] 
[01:48:54] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:48:54] Build completed unsuccessfully in 0:39:05
[01:48:54] make: *** [check] Error 1
[01:48:54] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:02ddf79a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Mar 21 23:37:01 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)

@bors
Copy link
Contributor

bors commented Mar 22, 2019

☔ The latest upstream changes (presumably #57810) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-highfive
Copy link
Collaborator

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:0ace0e88:start=1553557812434740059,finish=1553557813444816029,duration=1010075970
$ 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
Setting environment variables from .travis.yml
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:18:55] 
[01:18:55] running 9 tests
[01:18:55] iiiiiiiii
[01:18:55] 
[01:18:55]  finished in 0.158
[01:18:55] 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:19:12] 
[01:19:12] running 120 tests
[01:19:40] .iiiii...i.....i..i...i..i.i...i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i 100/120
[01:19:45] .i......iii.i.....ii
[01:19:45] 
[01:19:45]  finished in 33.181
[01:19:45] travis_fold:end:test_debuginfo

---
[01:45:20] travis_fold:end:stage0-linkchecker

[01:45:20] travis_time:end:stage0-linkchecker:start=1553564142482089225,finish=1553564144524837576,duration=2042748351

[01:45:26] std/sync/atomic/struct.AtomicIsize.html:3: absolute path - /checkout/src/libcore/std/primitive.isize.html
[01:45:26] std/sync/atomic/struct.AtomicUsize.html:3: absolute path - /checkout/src/libcore/std/primitive.usize.html
[01:45:26] std/sync/atomic/struct.AtomicU32.html:3: absolute path - /checkout/src/libcore/std/primitive.u32.html
[01:45:26] std/sync/atomic/struct.AtomicI64.html:3: absolute path - /checkout/src/libcore/std/primitive.i64.html
[01:45:26] std/sync/atomic/struct.AtomicI32.html:3: absolute path - /checkout/src/libcore/std/primitive.i32.html
[01:45:26] std/sync/atomic/struct.AtomicU64.html:3: absolute path - /checkout/src/libcore/std/primitive.u64.html
[01:45:26] std/sync/atomic/struct.AtomicU8.html:3: absolute path - /checkout/src/libcore/std/primitive.u8.html
[01:45:26] std/sync/atomic/struct.AtomicU16.html:3: absolute path - /checkout/src/libcore/std/primitive.u16.html
[01:45:26] std/sync/atomic/struct.AtomicI16.html:3: absolute path - /checkout/src/libcore/std/primitive.i16.html
[01:45:26] std/sync/atomic/struct.AtomicI8.html:3: absolute path - /checkout/src/libcore/std/primitive.i8.html
[01:45:32] thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:41:9
[01:45:32] 
[01:45:32] 
[01:45:32] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
[01:45:32] expected success, got: exit code: 101
[01:45:32] expected success, got: exit code: 101
[01:45:32] 
[01:45:32] 
[01:45:32] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:45:32] Build completed unsuccessfully in 0:38:50
[01:45:32] Makefile:48: recipe for target 'check' failed
[01:45:32] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:038743dc
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Mar 26 01:35:56 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)

@QuietMisdreavus
Copy link
Member

[01:45:26] std/sync/atomic/struct.AtomicIsize.html:3: absolute path - /checkout/src/libcore/std/primitive.isize.html
[01:45:26] std/sync/atomic/struct.AtomicUsize.html:3: absolute path - /checkout/src/libcore/std/primitive.usize.html
[01:45:26] std/sync/atomic/struct.AtomicU32.html:3: absolute path - /checkout/src/libcore/std/primitive.u32.html
[01:45:26] std/sync/atomic/struct.AtomicI64.html:3: absolute path - /checkout/src/libcore/std/primitive.i64.html
[01:45:26] std/sync/atomic/struct.AtomicI32.html:3: absolute path - /checkout/src/libcore/std/primitive.i32.html
[01:45:26] std/sync/atomic/struct.AtomicU64.html:3: absolute path - /checkout/src/libcore/std/primitive.u64.html
[01:45:26] std/sync/atomic/struct.AtomicU8.html:3: absolute path - /checkout/src/libcore/std/primitive.u8.html
[01:45:26] std/sync/atomic/struct.AtomicU16.html:3: absolute path - /checkout/src/libcore/std/primitive.u16.html
[01:45:26] std/sync/atomic/struct.AtomicI16.html:3: absolute path - /checkout/src/libcore/std/primitive.i16.html
[01:45:26] std/sync/atomic/struct.AtomicI8.html:3: absolute path - /checkout/src/libcore/std/primitive.i8.html
[01:45:32] thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:41:9
[01:45:32] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:45:32] 
[01:45:32] 
[01:45:32] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
[01:45:32] expected success, got: exit code: 101

Why was the atomics doc change included in this PR?

@GuillaumeGomez
Copy link
Member Author

I saw the error and I removed the useless full path. :-.

@GuillaumeGomez
Copy link
Member Author

And fixed the error.

@rust-highfive
Copy link
Collaborator

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:07ab4304:start=1553635445536095868,finish=1553635557887124155,duration=112351028287
$ 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
Setting environment variables from .travis.yml
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:24:34] 
[01:24:34] running 9 tests
[01:24:34] iiiiiiiii
[01:24:34] 
[01:24:34]  finished in 0.161
[01:24:34] 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:24:50] 
[01:24:50] running 120 tests
[01:25:17] .iiiii...i.....i..i...i..i.i...i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i 100/120
[01:25:22] .i......iii.i.....ii
[01:25:22] 
[01:25:22]  finished in 31.841
[01:25:22] travis_fold:end:test_debuginfo

---
Check compiletest suite=run-make-fulldeps mode=run-make (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:53:32] 
[01:53:32] running 195 tests
[01:54:00] ..................i...i................................................................i............ 100/195
[01:54:46] ...........................................F.......i......................................i....
[01:54:46] 
[01:54:46] ---- [run-make] run-make-fulldeps/rustdoc-error-lines stdout ----
[01:54:46] 
[01:54:46] error: make failed
[01:54:46] error: make failed
[01:54:46] status: exit code: 2
[01:54:46] command: "make"
[01:54:46] stdout:
[01:54:46] ------------------------------------------
[01:54:46] make[1]: Entering directory '/checkout/src/test/run-make-fulldeps/rustdoc-error-lines'
[01:54:46] 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:54:46] "/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:54:46] [[[ begin stdout ]]]
[01:54:46] running 1 test
[01:54:46] test input.rs - foo (line 6) ... FAILED
[01:54:46] 
[01:54:46] failures:
---
[01:54:46] 
[01:54:46] error: aborting due to previous error
[01:54:46] 
[01:54:46] For more information about this error, try `rustc --explain E0308`.
[01:54:46] thread 'input.rs - foo (line 6)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:310:13
[01:54:46] 
[01:54:46] 
[01:54:46] failures:
[01:54:46]     input.rs - foo (line 6)
[01:54:46]     input.rs - foo (line 6)
[01:54:46] 
[01:54:46] test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:54:46] 
[01:54:46] 
[01:54:46] [[[ end stdout ]]]
[01:54:46] Error: cannot match: input.rs:7:15
[01:54:46] Makefile:7: recipe for target 'all' failed
[01:54:46] 
[01:54:46] ------------------------------------------
[01:54:46] stderr:
[01:54:46] ------------------------------------------
[01:54:46] ------------------------------------------
[01:54:46] make[1]: *** [all] Error 1
[01:54:46] ------------------------------------------
[01:54:46] 
[01:54:46] thread '[run-make] run-make-fulldeps/rustdoc-error-lines' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3369:9
[01:54:46] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
---
[01:54:46] test result: FAILED. 189 passed; 1 failed; 5 ignored; 0 measured; 0 filtered out
[01:54:46] 
[01:54:46] 
[01:54:46] 
[01:54:46] 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:54:46] 
[01:54:46] 
[01:54:46] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:496:22
[01:54:46] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:54:46] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:54:46] Build completed unsuccessfully in 0:42:21
[01:54:46] make: *** [check] Error 1
[01:54:46] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1bbb7205
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Mar 26 23:20:53 UTC 2019
---
travis_time:end:108e9b92:start=1553642455450145067,finish=1553642455457642399,duration=7497332
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:210eb58e
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:09e55e27
travis_time:start:09e55e27
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6

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
Copy link
Member Author

... Or maybe not...

@QuietMisdreavus
Copy link
Member


[01:54:46] ---- [run-make] run-make-fulldeps/rustdoc-error-lines stdout ----
[01:54:46] 
[01:54:46] error: make failed
[01:54:46] status: exit code: 2
[01:54:46] command: "make"
[01:54:46] stdout:
[01:54:46] ------------------------------------------
[01:54:46] make[1]: Entering directory '/checkout/src/test/run-make-fulldeps/rustdoc-error-lines'
[01:54:46] 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:54:46] "/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:54:46] [[[ begin stdout ]]]
[01:54:46] �[90m
[01:54:46] running 1 test
[01:54:46] test input.rs - foo (line 6) ... FAILED
[01:54:46] 
[01:54:46] failures:
[01:54:46] 
[01:54:46] ---- input.rs - foo (line 6) stdout ----
[01:54:46] error[E0308]: mismatched types
[01:54:46]  --> input.rs:8:15
[01:54:46]   |
[01:54:46] 4 | let x: char = 1;
[01:54:46]   |               ^ expected char, found u8
[01:54:46] 
[01:54:46] error: aborting due to previous error
[01:54:46] 
[01:54:46] For more information about this error, try `rustc --explain E0308`.
[01:54:46] thread 'input.rs - foo (line 6)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:310:13
[01:54:46] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:54:46] 
[01:54:46] 
[01:54:46] failures:
[01:54:46]     input.rs - foo (line 6)
[01:54:46] 
[01:54:46] test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:54:46] 
[01:54:46] �[0m
[01:54:46] [[[ end stdout ]]]
[01:54:46] �[1;31mError: cannot match: input.rs:7:15�[0m
[01:54:46] Makefile:7: recipe for target 'all' failed

Looks like the test run-make-fulldeps/rustdoc-error-lines makes sure that the span information given from doctests is correct, but this change messed up the line numbers? The test is looking for the string "input.rs:7:15" in the output, but it looks like the actual string was "input.rs:8:15". Looking at the test file being run, it looks like it's supposed to be line 7, so i'm going to guess that something in the update messed with line counting.

@sanxiyn sanxiyn 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 29, 2019
@bors
Copy link
Contributor

bors commented Mar 30, 2019

☔ The latest upstream changes (presumably #59464) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril
Copy link
Contributor

Centril commented Mar 30, 2019

Ping from triage, @GuillaumeGomez, you need to rebase and also see #59349 (comment).

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Mar 30, 2019

I also need to wait for a new pulldown-cmark release.

@jonas-schievink jonas-schievink added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Apr 1, 2019
@QuietMisdreavus
Copy link
Member

If we need to wait for upstream pulldown to update, should we even keep this PR open?

@GuillaumeGomez
Copy link
Member Author

As you prefer?

@QuietMisdreavus
Copy link
Member

If we expect it to be a while before the crate updates (and if we require the update to fix the test issue), i would rather close this PR so we don't have it dangling.

@GuillaumeGomez
Copy link
Member Author

Let's close it then.

@marcusklaas
Copy link
Contributor

pulldown-cmark 0.4.1 was published today: https://crates.io/crates/pulldown-cmark

@GuillaumeGomez
Copy link
Member Author

Thanks for the notification. I'll make another PR.

@GuillaumeGomez GuillaumeGomez deleted the up-pulldown branch April 28, 2019 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update to last pulldown-cmark version
8 participants