Move keyword primitive css dom #85631
Merged
Conversation
This file contains 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
GuillaumeGomez
added
T-rustdoc
|
Some changes occurred in HTML/CSS/JS. |
rust-highfive
added
the
S-waiting-on-review
GuillaumeGomez
changed the title
jsha
reviewed
May 24, 2021
Comment on lines
+990
to
+995
| var extra = ""; | ||
| if (type === "primitive") { | ||
| extra = " <i>(primitive type)</i>"; | ||
| } else if (type === "keyword") { | ||
| extra = " <i>(keyword)</i>"; | ||
| } |
There was a problem hiding this comment.
Why declare a separate variable rather than add these directly to name?
There was a problem hiding this comment.
Simpler to read in my opinion. So as your prefer. :)
There was a problem hiding this comment.
If you prefer this way I'm fine with it. :-) Will r+ once conflicts are resolved.
|
☔ The latest upstream changes (presumably #85639) made this pull request unmergeable. Please resolve the merge conflicts. |
GuillaumeGomez
force-pushed
the
move-keywrod-primitive-css-dom
branch
from
186ea89 to
a06829c
Compare
|
@bors: r=jsha rollup |
|
📌 Commit a06829c has been approved by |
bors
added
S-waiting-on-bors
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
May 25, 2021
…ve-css-dom, r=jsha Move keyword primitive css dom Fixes rust-lang#85569. r? `@jsha`
This was referenced May 25, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 25, 2021
…laumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#85361 (Use TargetTriple::from_path in rustdoc) - rust-lang#85605 (Replace Local::new(1) with CAPTURE_STRUCT_LOCAL) - rust-lang#85631 (Move keyword primitive css dom) - rust-lang#85644 (Better English for documenting when to use unimplemented!()) - rust-lang#85650 (Add some backticks to the `rustc_middle::ty::adjustment::Adjustment` docs) - rust-lang#85657 (Remove doubled braces in non_exhaustive structs’ documentation text.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #85569.
r? @jsha