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

[stable] Prepare Rust 1.84.1 point release #136158

Merged
merged 13 commits into from
Jan 28, 2025
Merged

Conversation

lqd and others added 13 commits January 23, 2025 11:21
This reverts commit 8a568d9.

(cherry picked from commit 764e3e2)
(cherry picked from commit 3f08997)
There is a chance that these tools are being installed from an external LLVM
and we have no control over them. If any of these tools use symlinks, they will
fail during tarball distribution. This change makes copying process to resolve
symlinks just before placing them into the destination path.

Signed-off-by: onur-ozkan <[email protected]>
(cherry picked from commit cde58dd)
(cherry picked from commit 94bf8f0)
(cherry picked from commit 0910173)
…tions with dummy spans instead of dropping them entirely

Revert most of rust-lang#133194 (except the test and the comment fixes). Then refix
not emitting locations at all when the correct location discriminator value
exceeds LLVM's capacity.

(cherry picked from commit 45ef927)
Previously, bootstrap was using `Config::last_modified_commit` unconditionally to figure
the commit has to download precompiled rustc artifact from CI, which was leading builds to
fail on tarball sources as `Config::last_modified_commit` requires `git` to be present in the project
source. This change makes bootstrap to call `Config::last_modified_commit` only when it's running on
git-managed source and read `git-commit-hash` file otherwise.

Signed-off-by: onur-ozkan <[email protected]>
(cherry picked from commit 903cddb)
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jan 27, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 27, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

@cuviper
Copy link
Member Author

cuviper commented Jan 27, 2025

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Jan 27, 2025

📌 Commit 690f433 has been approved by cuviper

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 27, 2025
@cuviper
Copy link
Member Author

cuviper commented Jan 27, 2025

Not sure if this works yet, but in case anyone wants to sanity-check my point release relnotes:

@rustbot ping relnotes-interest-group

@rustbot
Copy link
Collaborator

rustbot commented Jan 27, 2025

Hi relnotes-interest-group, this PR adds release notes. Could you review this PR
if you have time? Thanks <3

cc @alex-semenyuk @jieyouxu @joshtriplett @traviscross

@bors
Copy link
Contributor

bors commented Jan 27, 2025

⌛ Testing commit 690f433 with merge e71f9a9...

@bors
Copy link
Contributor

bors commented Jan 28, 2025

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing e71f9a9 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 28, 2025
@bors bors merged commit e71f9a9 into rust-lang:stable Jan 28, 2025
7 checks passed
@rustbot rustbot added this to the 1.84.1 milestone Jan 28, 2025
@jieyouxu
Copy link
Member

(Late, but relnotes look good)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants