Skip to content

Commit 8f5abb7

Browse files
committed
Auto merge of #144502 - matthiaskrgr:rollup-o81uk9m, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang/rust#144331 (Disable non_exhaustive_omitted_patterns within matches! macro) - rust-lang/rust#144376 (Suggest unwrapping when private method name is available in inner type) - rust-lang/rust#144421 (Call `is_parsed_attribute` rather than keeping track of a list of parsed attributes manually) - rust-lang/rust#144424 (Allow setting `release-blog-post` label with rustbot) - rust-lang/rust#144427 (rename ext_tool_checks to extra_checks and use mod.rs) - rust-lang/rust#144435 (rustc-dev-guide subtree update) - rust-lang/rust#144448 (Limit defaultness query to impl of trait) - rust-lang/rust#144462 (Allow pretty printing paths with `-Zself-profile-events=args`) - rust-lang/rust#144463 (change_tracker: fix a typo) - rust-lang/rust#144468 (resolve: Do not create `NameResolutions` on access unless necessary) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 514982d + 381abb6 commit 8f5abb7

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
460259d14de0274b97b8801e08cb2fe5f16fdac5
1+
efd420c770bb179537c01063e98cb6990c439654

src/external-repos.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,24 @@ implement a new tool feature or test, that should happen in one collective rustc
4040
* `portable-simd` ([sync script](https://github.com/rust-lang/portable-simd/blob/master/subtree-sync.sh))
4141
* `rustfmt`
4242
* `rustc_codegen_cranelift` ([sync script](https://github.com/rust-lang/rustc_codegen_cranelift/blob/113af154d459e41b3dc2c5d7d878e3d3a8f33c69/scripts/rustup.sh#L7))
43-
* Using the [josh] tool
44-
* `miri` ([sync guide](https://github.com/rust-lang/miri/blob/master/CONTRIBUTING.md#advanced-topic-syncing-with-the-rustc-repo))
45-
* `rust-analyzer` ([sync script](https://github.com/rust-lang/rust-analyzer/blob/2e13684be123eca7181aa48e043e185d8044a84a/xtask/src/release.rs#L147))
46-
* `rustc-dev-guide` ([josh sync](#synchronizing-a-josh-subtree))
47-
* `compiler-builtins` ([josh sync](#synchronizing-a-josh-subtree))
48-
* `stdarch` ([josh sync](#synchronizing-a-josh-subtree))
43+
* Using the [josh](#synchronizing-a-josh-subtree) tool
44+
* `miri`
45+
* `rust-analyzer`
46+
* `rustc-dev-guide`
47+
* `compiler-builtins`
48+
* `stdarch`
4949

5050
### Josh subtrees
5151

52-
The [josh] tool is an alternative to git subtrees, which manages git history in a different way and scales better to larger repositories. Specific tooling is required to work with josh; you can check out the `miri` or `rust-analyzer` scripts linked above for inspiration. We provide a helper [`rustc-josh-sync`][josh-sync] tool to help with the synchronization, described [below](#synchronizing-a-josh-subtree).
52+
The [josh] tool is an alternative to git subtrees, which manages git history in a different way and scales better to larger repositories. Specific tooling is required to work with josh. We provide a helper [`rustc-josh-sync`][josh-sync] tool to help with the synchronization, described [below](#synchronizing-a-josh-subtree).
5353

5454
### Synchronizing a Josh subtree
5555

5656
We use a dedicated tool called [`rustc-josh-sync`][josh-sync] for performing Josh subtree updates.
57-
Currently, we are migrating Josh repositories to it. So far, it is used in:
57+
The commands below can be used for all our Josh subtrees, although note that `miri`
58+
requires you to perform some [additional steps](https://github.com/rust-lang/miri/blob/master/CONTRIBUTING.md#advanced-topic-syncing-with-the-rustc-repo) during pulls.
5859

59-
- compiler-builtins
60-
- rustc-dev-guide
61-
- stdarch
62-
63-
To install the tool:
60+
You can install the tool using the following command:
6461
```
6562
cargo install --locked --git https://github.com/rust-lang/josh-sync
6663
```
@@ -80,6 +77,9 @@ switch to its repository checkout directory in your terminal).
8077
8178
#### Performing push
8279
80+
> NOTE:
81+
> Before you proceed, look at some guidance related to Git [on josh-sync README].
82+
8383
1) Run the push command to create a branch named `<branch-name>` in a `rustc` fork under the `<gh-username>` account
8484
```
8585
rustc-josh-sync push <branch-name> <gh-username>
@@ -173,3 +173,4 @@ the week leading up to the beta cut.
173173
[Toolstate chapter]: https://forge.rust-lang.org/infra/toolstate.html
174174
[josh]: https://josh-project.github.io/josh/intro.html
175175
[josh-sync]: https://github.com/rust-lang/josh-sync
176+
[on josh-sync README]: https://github.com/rust-lang/josh-sync#git-peculiarities

0 commit comments

Comments
 (0)