From af4c9c135a674db5c7faaebbc4f5f66a0abb8f3b Mon Sep 17 00:00:00 2001
From: Weihang Lo <me@weihanglo.tw>
Date: Tue, 26 Mar 2024 15:33:11 -0400
Subject: [PATCH 1/3] [stable-1.77] cargo backport
---
src/tools/cargo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/cargo b/src/tools/cargo
index 3fe68eabf93cb..e52e360061cac 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 3fe68eabf93cbf3772bbcad09a9206c783e2de3f
+Subproject commit e52e360061cacbbeac79f7f1215a7a90b6f08442
From dcb198695fa9be6fda82198d4f53676a5f84edf5 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Mon, 18 Mar 2024 08:56:12 -0700
Subject: [PATCH 2/3] Fix heading anchors in doc pages.
---
src/doc/rust.css | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/src/doc/rust.css b/src/doc/rust.css
index e0bf64c33bcf0..a93c1be7d7a9e 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 {
From 42c356d3ee820ff4ea437f9304263c1ea668173c Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Tue, 26 Mar 2024 19:33:12 -0400
Subject: [PATCH 3/3] Prepare 1.77.1
---
RELEASES.md | 10 ++++++++++
src/version | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/RELEASES.md b/RELEASES.md
index 3f7814d184c66..29fe44a872310 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/version b/src/version
index 79e15fd49370a..b1131583c6752 100644
--- a/src/version
+++ b/src/version
@@ -1 +1 @@
-1.77.0
+1.77.1