Use double quote for rustdoc html

[pickfire]

r? @GuillaumeGomez

Feels scary without escaping stuff when I looked at the code, probably susceptible to XSS.
Follow up of #75842

[ollie27]

I would prefer we standardize on using double quote everywhere because that's what pulldown-cmark uses.

[pickfire]

@ollie27 But that require escaping everywhere, or maybe we could do r#"xxx"# to reduce escapes?

[ollie27]

But that require escaping everywhere, or maybe we could do r#"xxx"# to reduce escapes?

I don't think that's too big of a deal. Unfortunately r#"xxx"# doesn't work well for multi line strings which is probably why it's not used currently.

[pickfire]

Double quotes usage is less than single quote right now, 85 vs 124 lines.

[bors]

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

[JohnCSimon]

Ping from triage
@pickfire Can you please address the merge conflict and failing build? Thank you.

[Dylan-DPC-zz]

@pickfire any updates on this pr?

[pickfire]

I was waiting for reviewer to say if we should proceed with this, if it is good then I will go and resolve the conflicts and fix the build, otherwise can just close it. Thanks for the ping.

[crlf0710]

Triage: It seems this PR needs decision here. @GuillaumeGomez@jyn514

[jyn514]

@pickfire if you use double quotes like suggested by ollie (#76096 (comment)) and revert the change to resource_suffix then I think this good to go.

[jyn514]

Oh wait, you already did that 😆 this looks fine after a rebase then.

[bors]

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

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

[pickfire]

@jyn514 I rebased but now there is a merge conflict again.

[jyn514]

@pickfire please ping me after you rebase, I don't know to review unless you say something. Sorry you have to rebase again.

[jyn514]

@bors p=1

This PR bitrots quickly.

[pickfire]

@jyn514 ping

[jyn514]

@pickfire you need to run x.py fmt:

 Diff in /checkout/src/librustdoc/html/render/mod.rs at line 87:
crate fn ensure_trailing_slash(v: &str) -> impl fmt::Display + '_ {
crate::html::format::display_fn(move |f| {
- if !v.ends_with('/') && !v.is_empty() {
- write!(f, "{}/", v)
- } else {
- write!(f, "{}", v)
- }
+ if !v.ends_with('/') && !v.is_empty() { write!(f, "{}/", v) } else { write!(f, "{}", v) }
})
}
Diff in /checkout/src/librustdoc/html/render/mod.rs at line 1870:
}
fn document_non_exhaustive_header(item: &clean::Item) -> &str {
- if item.is_non_exhaustive() {
- " (Non-exhaustive)"
- } else {
- ""
- }
+ if item.is_non_exhaustive() { " (Non-exhaustive)" } else { "" }
}
fn document_non_exhaustive(w: &mut Buffer, item: &clean::Item) {
Diff in /checkout/src/librustdoc/html/render/mod.rs at line 4144:
if is_negative_impl { "!" } else { "" },
out
);
- if links.insert(generated.clone()) {
- Some(generated)
- } else {
- None
- }
+ if links.insert(generated.clone()) { Some(generated) } else { None }
} else {
None
}

[pickfire]

I won't be running ./x.py fmt, I probably need to run that command when I sleep (I am sleeping soon anyway) and get the result when I wake up. I just fixed it manually according to the CI output.

[jyn514]

@pickfire x.py fmt only takes a few seconds to run (at most a few minutes if you have to compile bootstrap first). But if it works, it works.

[pickfire]

I already took a few minutes to compile bootstrap. Oh no, merge conflicts! T_T

[bors]

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

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

[pickfire]

@jyn514 pong

[jyn514]

@bors delegate=pickfire

Please wait to approve until CI passes, and use r=jyn514 instead of r+. Thanks for sticking with this, I know merge conflicts are painful.

[bors]

✌️ @pickfire can now approve this pull request

[jyn514]

---- [rustdoc] rustdoc/index-page.rs stdout ----
10: @has check failed
`XPATH PATTERN` did not match
// @has - '//ul[@class="crate mod"]//a[@href="all_item_types/index.html"]' 'all_item_types'

Maybe you made a typo somewhere?

[pickfire]

@ollie27 Thanks

r=jyn514

[pickfire]

@bors r=jyn514

[bors]

📌 Commit e96ca1b has been approved by jyn514

[bors]

⌛ Testing commit e96ca1b with merge 03687f8...

[bors]

☀️ Test successful - checks-actions, checks-azure
Approved by: jyn514
Pushing 03687f8 to master...