Merged
Conversation
rustbot
added
A-testsuite
fmease
commented
Mar 12, 2024
| "check-stdout", | ||
| "check-test-line-numbers-match", | ||
| "compile-flags", | ||
| "count", |
Member
Author
Member
There was a problem hiding this comment.
I must have assumed it was a valid directive too...
fmease
commented
Mar 12, 2024
| U::Output: Display + Copy | ||
| // @matches foo/fn.where_clause.html '//*[@class="rust item-decl"]//code' "\ | ||
| // where_clause<T, U>\(param_one: T, param_two: U\)where\n\ | ||
| // \ T: Add<U> \+ Display \+ Copy,\n\ |
Member
Author
There was a problem hiding this comment.
The \ right before the LF makes htmldocck dedent the following line, hence the “floating” \ on this line: It stops the dedentation process and “bakes” 4 literal spaces into the string literal whose presence we want to check.
Contributor
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 12, 2024
…kingjubilee Rollup of 12 pull requests Successful merges: - rust-lang#121754 ([bootstrap] Move the `split-debuginfo` setting to the per-target section) - rust-lang#121953 (Add tests for the generated assembly of mask related simd instructions.) - rust-lang#122081 (validate `builder::PATH_REMAP`) - rust-lang#122245 (Detect truncated DepGraph files) - rust-lang#122354 (bootstrap: Don't eagerly format verbose messages) - rust-lang#122355 (rustdoc: fix up old test) - rust-lang#122363 (tests: Add ui/attributes/unix_sigpipe/unix_sigpipe-str-list.rs) - rust-lang#122366 (Fix stack overflow with recursive associated types) - rust-lang#122377 (Fix discriminant_kind copy paste from the pointee trait case) - rust-lang#122378 (Properly rebuild rustbooks) - rust-lang#122380 (Fix typo in lib.rs of proc_macro) - rust-lang#122381 (llvm-wrapper: adapt for LLVM API changes) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 12, 2024
Rollup merge of rust-lang#122355 - fmease:rustdoc-fix-up-old-test, r=notriddle rustdoc: fix up old test `tests/rustdoc/line-breaks.rs` had several issues: 1. It used `//`@count`` instead of `// `@count`` (notice the space!) which gets treated as a `ui_test` directive instead of a `htmldocck` one. `compiletest` didn't flag it as an error because it's allowlisted ([rust-lang#121561](rust-lang#121561)) presumably precisely because of this test. And before the compiletest→ui_test migration, these directives must've been ignored, too, because … 2. … the checks themselves no longer work either: The count of `<br>`s is actually 0 in all 3 cases because – well – we no longer generate any `<br>`s inside `<pre>`s. Since I don't know how to ``@count`` `\n`s instead of `<br>`s, I've turned them into ``@matches`.` Btw, I don't know if this test is still desirable or if we have other tests that cover this (I haven't checked). r? rustdoc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
tests/rustdoc/line-breaks.rshad several issues://@countinstead of// @count(notice the space!) which gets treated as aui_testdirective instead of ahtmldocckone.compiletestdidn't flag it as an error because it's allowlisted (#121561) presumably precisely because of this test. And before the compiletest→ui_test migration, these directives must've been ignored, too, because …<br>s is actually 0 in all 3 cases because – well – we no longer generate any<br>s inside<pre>s.Since I don't know how to
@count\ns instead of<br>s, I've turned them into@matches. Btw, I don't know if this test is still desirable or if we have other tests that cover this (I haven't checked).r? rustdoc