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

Rollup of 8 pull requests #107300

Closed
wants to merge 24 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
edd647e
Release notes for 1.67.0
cuviper Jan 21, 2023
568d6c1
Expand 1.67 to 1.67.0
cuviper Jan 21, 2023
43c18e9
Remove relnote for #84022 due to revert #107133
cuviper Jan 21, 2023
ddcb02d
Move 0.5 rounding to a compat note
cuviper Jan 21, 2023
b9be9e5
Move the layout change to 1.67 compat notes
cuviper Jan 21, 2023
7f5ce94
Bring tests back into rustc source tarball
tmiasko Jan 23, 2023
e65b361
rustdoc: rearrange HTML in primitive reference links
notriddle Jan 24, 2023
e6e93e0
add test where we ignore hr implied bounds
lcnr Jan 24, 2023
ad73936
Delete `SimplifyArmIdentity` and `SimplifyBranchSame` mir opts
JakobDegen Jan 24, 2023
11a94f2
rustdoc: prevent scroll bar on source viewer
kadiwa4 Jan 24, 2023
430dab0
implement builtin candidate
BoxyUwU Jan 24, 2023
2f924b0
sorry erica
BoxyUwU Jan 24, 2023
a418e39
no without_constness
BoxyUwU Jan 24, 2023
273254e
rustdoc: use smarter encoding for playground URL
notriddle Jan 24, 2023
e500c44
rustdoc: update tests for smarter playground url encoding
notriddle Jan 25, 2023
0db0419
rustdoc: add comment for why playground URLs have unencoded angle bra…
notriddle Jan 25, 2023
f30a60b
Rollup merge of #107142 - cuviper:relnotes-1.67, r=Mark-Simulacrum
matthiaskrgr Jan 25, 2023
37095b8
Rollup merge of #107239 - tmiasko:tests, r=Mark-Simulacrum
matthiaskrgr Jan 25, 2023
a13b6c6
Rollup merge of #107244 - notriddle:notriddle/primitive-reference-lin…
matthiaskrgr Jan 25, 2023
bd2b2ca
Rollup merge of #107255 - lcnr:implied-b-hr, r=oli-obk
matthiaskrgr Jan 25, 2023
1deaa69
Rollup merge of #107256 - JakobDegen:delete-sai, r=cjgillot
matthiaskrgr Jan 25, 2023
2c432b6
Rollup merge of #107266 - kadiwa4:source_viewer_scrollbar, r=notriddle
matthiaskrgr Jan 25, 2023
6c440bf
Rollup merge of #107282 - BoxyUwU:erica_builtin_pointee_impls, r=comp…
matthiaskrgr Jan 25, 2023
6b81c24
Rollup merge of #107284 - notriddle:notriddle/plus, r=jsha
matthiaskrgr Jan 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rustdoc: rearrange HTML in primitive reference links
This patch avoids hard-to-click single character links by making
the generic part of the link:

Before: <a href="#">&</a>T

After: <a href="#">&T</a>
  • Loading branch information
notriddle committed Jan 24, 2023
commit e65b36110f943118b7e50c4e39e26ad1f07d8552
10 changes: 2 additions & 8 deletions src/librustdoc/html/format.rs
Original file line number Diff line number Diff line change
@@ -1064,14 +1064,8 @@ fn fmt_type<'cx>(
fmt_type(ty, f, use_absolute, cx)?;
write!(f, ")")
}
clean::Generic(..) => {
primitive_link(
f,
PrimitiveType::Reference,
&format!("{}{}{}", amp, lt, m),
cx,
)?;
fmt_type(ty, f, use_absolute, cx)
clean::Generic(name) => {
primitive_link(f, PrimitiveType::Reference, &format!("{amp}{lt}{m}{name}"), cx)
}
_ => {
write!(f, "{}{}{}", amp, lt, m)?;
2 changes: 1 addition & 1 deletion tests/rustdoc/whitespace-after-where-clause.enum.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="item-decl"><pre class="rust"><code>pub enum Cow&lt;'a, B&gt;<span class="where fmt-newline">where<br />&#160;&#160;&#160;&#160;B: <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + 'a,</span>{
Borrowed(<a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a </a>B),
Borrowed(<a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a B</a>),
Whatever(<a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>),
}</code></pre></div>
2 changes: 1 addition & 1 deletion tests/rustdoc/whitespace-after-where-clause.enum2.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="item-decl"><pre class="rust"><code>pub enum Cow2&lt;'a, B:&#160;?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + 'a&gt; {
Borrowed(<a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a </a>B),
Borrowed(<a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a B</a>),
Whatever(<a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>),
}</code></pre></div>
2 changes: 1 addition & 1 deletion tests/rustdoc/whitespace-after-where-clause.struct.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="item-decl"><pre class="rust"><code>pub struct Struct&lt;'a, B&gt;<span class="where fmt-newline">where<br />&#160;&#160;&#160;&#160;B: <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + 'a,</span>{
pub a: <a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a </a>B,
pub a: <a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a B</a>,
pub b: <a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>,
}</code></pre></div>
2 changes: 1 addition & 1 deletion tests/rustdoc/whitespace-after-where-clause.struct2.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="item-decl"><pre class="rust"><code>pub struct Struct2&lt;'a, B:&#160;?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;dyn <a class="trait" href="{{channel}}/core/clone/trait.Clone.html" title="trait core::clone::Clone">Clone</a>&gt; + 'a&gt; {
pub a: <a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a </a>B,
pub a: <a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a B</a>,
pub b: <a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>,
}</code></pre></div>