summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-03-27 03:10:50 +0000
committerbors <bors@rust-lang.org>2024-03-27 03:10:50 +0000
commit7cf61ebde7b22796c69757901dd346d0fe70bd97 (patch)
tree6c9e2ae4ba093e8999de2ec0dfc4d3d7e7f1749a
parentaedd173a2c086e558c2b66d3743b344f977621a7 (diff)
parent42c356d3ee820ff4ea437f9304263c1ea668173c (diff)
Auto merge of #123105 - weihanglo:update-stable-cargo, r=Mark-Simulacrum1.77.1
[stable-1.77] cargo backport 1 commits in 3fe68eabf93cbf3772bbcad09a9206c783e2de3f..e52e360061cacbbeac79f7f1215a7a90b6f08442 2024-02-29 00:16:03 +0000 to 2024-03-26 17:54:36 +0000 - [stable-1.77] Do not strip debuginfo by default for MSVC (rust-lang/cargo#13654) r? ghost
-rw-r--r--RELEASES.md10
-rw-r--r--src/doc/rust.css22
m---------src/tools/cargo0
-rw-r--r--src/version2
4 files changed, 33 insertions, 1 deletions
diff --git a/RELEASES.md b/RELEASES.md
index 3f7814d184c..29fe44a8723 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,3 +1,13 @@
+Version 1.77.1 (2024-03-28)
+===========================
+
+<a id="1.77.1"></a>
+
+- [Revert stripping debuginfo by default for Windows](https://github.com/rust-lang/cargo/pull/13654)
+ This fixes a regression in 1.77 by reverting to the previous default.
+ Platforms other than Windows are not affected.
+- Internal: [Fix heading anchor rendering in doc pages](https://github.com/rust-lang/rust/pull/122693)
+
Version 1.77.0 (2024-03-21)
==========================
diff --git a/src/doc/rust.css b/src/doc/rust.css
index e0bf64c33bc..a93c1be7d7a 100644
--- a/src/doc/rust.css
+++ b/src/doc/rust.css
@@ -136,6 +136,28 @@ h1 a:link, h1 a:visited, h2 a:link, h2 a:visited,
h3 a:link, h3 a:visited, h4 a:link, h4 a:visited,
h5 a:link, h5 a:visited {color: black;}
+h1, h2, h3, h4, h5 {
+ /* This is needed to be able to position the doc-anchor. Ideally there
+ would be a <div> around the whole document, but we don't have that. */
+ position: relative;
+}
+
+a.doc-anchor {
+ color: black;
+ display: none;
+ position: absolute;
+ left: -20px;
+ /* We add this padding so that when the cursor moves from the heading's text to the anchor,
+ the anchor doesn't disappear. */
+ padding-right: 5px;
+ /* And this padding is used to make the anchor larger and easier to click on. */
+ padding-left: 3px;
+}
+*:hover > .doc-anchor {
+ display: block;
+}
+
+
/* Code */
pre, code {
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 3fe68eabf93cbf3772bbcad09a9206c783e2de3
+Subproject e52e360061cacbbeac79f7f1215a7a90b6f0844
diff --git a/src/version b/src/version
index 79e15fd4937..b1131583c67 100644
--- a/src/version
+++ b/src/version
@@ -1 +1 @@
-1.77.0
+1.77.1