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

Turn rustc-dev-guide into a Josh subtree #134907

Merged
merged 2,577 commits into from
Jan 2, 2025
Merged

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Dec 29, 2024

Discussed on Zulip.

Accompanying rustc-dev-guide PR: rust-lang/rustc-dev-guide#2183

I didn't create a bootstrap step for rustc-dev-guide yet, because the rustc-dev-guide version that we currently use in this repo doesn't have linkcheck enabled and that fails tests.

The subtree starts with commit ad93c5f1c49f2aeb45f7a4954017b1e607df9f5e.

What I did:

export DIR=src/doc/rustc-dev-guide

# Remove submodule
git submodule status ${DIR}
git submodule deinit ${DIR}
git rm -r --cached ${DIR}
rm -rf ${DIR}
# Remove rustc-dev-guide from .gitmodules
git commit -m"Removed `${DIR}` submodule"

# Import history with josh
git fetch https://github.com/rust-lang/rustc-dev-guide ad93c5f1c49f2aeb45f7a4954017b1e607df9f5e
josh-filter ':prefix=src/doc/rustc-dev-guide' FETCH_HEAD
git merge --allow-unrelated FILTERED_HEAD

# A few follow-up cleanup commits

r? ehuss

TimNN and others added 30 commits April 5, 2024 07:05
* Fix some broken links under bootstrapping.

* Fix more broken links for bootstrapping.
rust-lang#1960)

* compiletest: specify which special env var and which particular CI job

* compiletest: fix grammar and add link to Dockerfile
The `-Z verbose` option has been renamed to `-Z verbose-internals` in
commit  b5d8361 [1] (PR rust-lang#119129 [2]). This commit updates the remaining
`-Z verbose` to `-Z verbose-internals`.

[1]: rust-lang@b5d8361
[2]: rust-lang#119129
Co-authored-by: Tshepang Mbambo <[email protected]>
Signed-off-by: onur-ozkan <[email protected]>
@ehuss
Copy link
Contributor

ehuss commented Dec 31, 2024

Thanks! I think there is a small list of prerequisites to move forward:

@ehuss
Copy link
Contributor

ehuss commented Dec 31, 2024

You might also want to delete this line that updates the submodule, just in case someone in the future wants to get the test step running, to help avoid an obvious problem.

Copy link
Member

@JohnTitor JohnTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, thank you!

@bors
Copy link
Contributor

bors commented Jan 1, 2025

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

@rustbot rustbot added the A-meta Area: Issues & PRs about the rust-lang/rust repository itself label Jan 1, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 1, 2025

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

@Kobzol
Copy link
Contributor Author

Kobzol commented Jan 1, 2025

  • I will be doing the pushes & pulls, with the hope that it will become automated soon-ish (I will work on implementing CI workflows to automate it).
  • Triagebot PR: Remove rustc-dev-guide as a submodule triagebot#1874
  • I added myself as the ping person for rustc-dev-guide in triagebot.toml

@Kobzol Kobzol force-pushed the rustc-dev-guide-josh branch from c025fd6 to 47e2baa Compare January 1, 2025 16:07
@rustbot

This comment was marked as off-topic.

@Kobzol
Copy link
Contributor Author

Kobzol commented Jan 1, 2025

Rebased.

@ehuss
Copy link
Contributor

ehuss commented Jan 1, 2025

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Jan 1, 2025

📌 Commit 47e2baa has been approved by ehuss

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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 1, 2025
@matthiaskrgr
Copy link
Member

@bors rollup=never

@bors
Copy link
Contributor

bors commented Jan 2, 2025

⌛ Testing commit 47e2baa with merge c528b8c...

@bors
Copy link
Contributor

bors commented Jan 2, 2025

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing c528b8c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 2, 2025
@bors bors merged commit c528b8c into rust-lang:master Jan 2, 2025
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Jan 2, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c528b8c): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -2.9%, secondary 0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.8% [2.8%, 2.8%] 1
Improvements ✅
(primary)
-2.9% [-2.9%, -2.9%] 1
Improvements ✅
(secondary)
-2.8% [-2.8%, -2.8%] 1
All ❌✅ (primary) -2.9% [-2.9%, -2.9%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 764.563s -> 763.985s (-0.08%)
Artifact size: 325.55 MiB -> 325.58 MiB (0.01%)

@Kobzol Kobzol deleted the rustc-dev-guide-josh branch January 2, 2025 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself has-merge-commits PR has merge commits, merge with caution. 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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.