Skip to content

Commit 0fcfb8b

Browse files
Rollup merge of #144803 - tshepang:rdg-sync, r=jieyouxu
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@9287205. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`
2 parents 5e1ea9c + 171c247 commit 0fcfb8b

File tree

7 files changed

+437
-19
lines changed

7 files changed

+437
-19
lines changed

src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ jobs:
1111
if: github.repository == 'rust-lang/rustc-dev-guide'
1212
uses: rust-lang/josh-sync/.github/workflows/rustc-pull.yml@main
1313
with:
14+
github-app-id: ${{ vars.APP_CLIENT_ID }}
1415
zulip-stream-id: 196385
1516
zulip-bot-email: "[email protected]"
1617
pr-base-branch: master
1718
branch-name: rustc-pull
1819
secrets:
1920
zulip-api-token: ${{ secrets.ZULIP_API_TOKEN }}
20-
token: ${{ secrets.GITHUB_TOKEN }}
21+
github-app-secret: ${{ secrets.APP_PRIVATE_KEY }}

src/doc/rustc-dev-guide/rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2b5e239c6b86cde974b0ef0f8e23754fb08ff3c5
1+
32e7a4b92b109c24e9822c862a7c74436b50e564

src/doc/rustc-dev-guide/src/SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
- [Next-gen trait solving](./solve/trait-solving.md)
177177
- [Invariants of the type system](./solve/invariants.md)
178178
- [The solver](./solve/the-solver.md)
179+
- [Candidate preference](./solve/candidate-preference.md)
179180
- [Canonicalization](./solve/canonicalization.md)
180181
- [Coinduction](./solve/coinduction.md)
181182
- [Caching](./solve/caching.md)

0 commit comments

Comments
 (0)