Skip to content

Commit ddfc7b9

Browse files
authored
Merge pull request rust-lang#29 from Kobzol/push
Push
2 parents 1e3e238 + b83b752 commit ddfc7b9

File tree

6 files changed

+9
-65
lines changed

6 files changed

+9
-65
lines changed

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ ci/date-check/target/
44

55
# Generated by check-in.sh
66
pulls.json
7+
8+
josh-sync/target

Diff for: rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dcfa38fe234de9304169afc6638e81d0dd222c06
1+
9c87288a7d2f03625a813df6d3bfe43c09ad4f5a

Diff for: src/appendix/glossary.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Term | Meaning
6969
<span id="rib">rib</span> | A data structure in the name resolver that keeps track of a single scope for names. ([see more](../name-resolution.md))
7070
<span id="rpit">RPIT</span> | A return-position `impl Trait`. ([see the reference](https://doc.rust-lang.org/reference/types/impl-trait.html#abstract-return-types)).
7171
<span id="rpitit">RPITIT</span> | A return-position `impl Trait` in trait. Unlike RPIT, this is desugared to a generic associated type (GAT). Introduced in [RFC 3425](https://rust-lang.github.io/rfcs/3425-return-position-impl-trait-in-traits.html). ([see more](../return-position-impl-trait-in-trait.md))
72-
<span id="scrutinee">scrutinee</div> | A scrutinee is the expression that is matched on in `match` expressions and similar pattern matching constructs. For example, in `match x { A => 1, B => 2 }`, the expression `x` is the scrutinee.
72+
<span id="scrutinee">scrutinee</span> | A scrutinee is the expression that is matched on in `match` expressions and similar pattern matching constructs. For example, in `match x { A => 1, B => 2 }`, the expression `x` is the scrutinee.
7373
<span id="sess">`sess`</span> | The compiler _session_, which stores global data used throughout compilation
7474
<span id="side-tables">side tables</span> | Because the [AST](#ast) and HIR are immutable once created, we often carry extra information about them in the form of hashtables, indexed by the id of a particular node.
7575
<span id="sigil">sigil</span> | Like a keyword but composed entirely of non-alphanumeric tokens. For example, `&` is a sigil for references.

Diff for: src/bug-fix-procedure.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ that we use for unstable features:
227227
Ideally, breaking changes should have landed on the **stable branch** of the
228228
compiler before they are finalized.
229229

230-
<a id="guide">
230+
<a id="guide"></a>
231231

232232
### Removing a lint
233233

Diff for: src/contributing.md

+1-61
Original file line numberDiff line numberDiff line change
@@ -422,68 +422,8 @@ Just a few things to keep in mind:
422422

423423
## Issue triage
424424

425-
Sometimes, an issue will stay open, even though the bug has been fixed.
426-
And sometimes, the original bug may go stale because something has changed in the meantime.
425+
Please see <https://forge.rust-lang.org/release/issue-triaging.html>.
427426

428-
It can be helpful to go through older bug reports and make sure that they are still valid.
429-
Load up an older issue, double check that it's still true,
430-
and leave a comment letting us know if it is or is not.
431-
The [least recently updated sort][lru] is good for finding issues like this.
432-
433-
[Thanks to `@rustbot`][rustbot], anyone can help triage issues by adding
434-
appropriate labels to issues that haven't been triaged yet:
435-
436-
[lru]: https://github.com/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc
437-
[rustbot]: ./rustbot.md
438-
439-
<style>
440-
.label-color {
441-
border-radius:0.5em;
442-
}
443-
table td:nth-child(2) {
444-
white-space: nowrap;
445-
}
446-
447-
</style>
448-
449-
| Labels | Color | Description |
450-
|--------|-------|-------------|
451-
| [A-] | <span class="label-color" style="background-color:#f7e101;">&#x2003;</span>&nbsp;Yellow | The **area** of the project an issue relates to. |
452-
| [B-] | <span class="label-color" style="background-color:#d304cb;">&#x2003;</span>&nbsp;Magenta | Issues which are **blockers**. |
453-
| [beta-] | <span class="label-color" style="background-color:#1e76d9;">&#x2003;</span>&nbsp;Dark Blue | Tracks changes which need to be [backported to beta][beta-backport] |
454-
| [C-] | <span class="label-color" style="background-color:#f5f1fd;">&#x2003;</span>&nbsp;Light Purple | The **category** of an issue. |
455-
| [D-] | <span class="label-color" style="background-color:#c9f7a3;">&#x2003;</span>&nbsp;Mossy Green | Issues for **diagnostics**. |
456-
| [E-] | <span class="label-color" style="background-color:#02e10c;">&#x2003;</span>&nbsp;Green | The **experience** level necessary to fix an issue. |
457-
| [F-] | <span class="label-color" style="background-color:#f9c0cc;">&#x2003;</span>&nbsp;Peach | Issues for **nightly features**. |
458-
| [I-] | <span class="label-color" style="background-color:#e10c02;">&#x2003;</span>&nbsp;Red | The **importance** of the issue. |
459-
| [I-\*-nominated] | <span class="label-color" style="background-color:#e10c02;">&#x2003;</span>&nbsp;Red | The issue has been nominated for discussion at the next meeting of the corresponding team. |
460-
| [I-prioritize] | <span class="label-color" style="background-color:#e10c02;">&#x2003;</span>&nbsp;Red | The issue has been nominated for prioritization by the team tagged with a **T**-prefixed label. |
461-
| [L-] | <span class="label-color" style="background-color:#64E9CF;">&#x2003;</span>&nbsp;Teal | The relevant **lint**. |
462-
| [metabug] | <span class="label-color" style="background-color:#5319e7;">&#x2003;</span>&nbsp;Purple | Bugs that collect other bugs. |
463-
| [O-] | <span class="label-color" style="background-color:#6e6ec0;">&#x2003;</span>&nbsp;Purple Grey | The **operating system** or platform that the issue is specific to. |
464-
| [P-] | <span class="label-color" style="background-color:#eb6420;">&#x2003;</span>&nbsp;Orange | The issue **priority**. These labels can be assigned by anyone that understand the issue and is able to prioritize it, and remove the [I-prioritize] label. |
465-
| [regression-] | <span class="label-color" style="background-color:#e4008a;">&#x2003;</span>&nbsp;Pink | Tracks regressions from a stable release. |
466-
| [relnotes] | <span class="label-color" style="background-color:#fad8c7;">&#x2003;</span>&nbsp;Light Orange | Changes that should be documented in the release notes of the next release. |
467-
| [S-] | <span class="label-color" style="background-color:#d3dddd;">&#x2003;</span>&nbsp;Gray | Tracks the **status** of pull requests. |
468-
| [S-tracking-] | <span class="label-color" style="background-color:#4682b4;">&#x2003;</span>&nbsp;Steel Blue | Tracks the **status** of [tracking issues]. |
469-
| [stable-] | <span class="label-color" style="background-color:#00229c;">&#x2003;</span>&nbsp;Dark Blue | Tracks changes which need to be [backported to stable][stable-backport] in anticipation of a point release. |
470-
| [T-] | <span class="label-color" style="background-color:#bfd4f2;">&#x2003;</span>&nbsp;Blue | Denotes which **team** the issue belongs to. |
471-
| [WG-] | <span class="label-color" style="background-color:#c2e0c6;">&#x2003;</span>&nbsp;Green | Denotes which **working group** the issue belongs to. |
472-
473-
474-
[A-]: https://github.com/rust-lang/rust/labels?q=A
475-
[B-]: https://github.com/rust-lang/rust/labels?q=B
476-
[C-]: https://github.com/rust-lang/rust/labels?q=C
477-
[D-]: https://github.com/rust-lang/rust/labels?q=D
478-
[E-]: https://github.com/rust-lang/rust/labels?q=E
479-
[F-]: https://github.com/rust-lang/rust/labels?q=F
480-
[I-]: https://github.com/rust-lang/rust/labels?q=I
481-
[L-]: https://github.com/rust-lang/rust/labels?q=L
482-
[O-]: https://github.com/rust-lang/rust/labels?q=O
483-
[P-]: https://github.com/rust-lang/rust/labels?q=P
484-
[S-]: https://github.com/rust-lang/rust/labels?q=S
485-
[T-]: https://github.com/rust-lang/rust/labels?q=T
486-
[WG-]: https://github.com/rust-lang/rust/labels?q=WG
487427
[stable-]: https://github.com/rust-lang/rust/labels?q=stable
488428
[beta-]: https://github.com/rust-lang/rust/labels?q=beta
489429
[I-\*-nominated]: https://github.com/rust-lang/rust/labels?q=nominated

Diff for: src/external-repos.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The following external projects are managed using some form of a `subtree`:
2121
* [rustfmt](https://github.com/rust-lang/rustfmt)
2222
* [rust-analyzer](https://github.com/rust-lang/rust-analyzer)
2323
* [rustc_codegen_cranelift](https://github.com/rust-lang/rustc_codegen_cranelift)
24+
* [rustc-dev-guide](https://github.com/rust-lang/rustc-dev-guide)
2425

2526
In contrast to `submodule` dependencies
2627
(see below for those), the `subtree` dependencies are just regular files and directories which can
@@ -38,8 +39,9 @@ implement a new tool feature or test, that should happen in one collective rustc
3839
* Using the [josh] tool
3940
* `miri` ([sync guide](https://github.com/rust-lang/miri/blob/master/CONTRIBUTING.md#advanced-topic-syncing-with-the-rustc-repo))
4041
* `rust-analyzer` ([sync script](https://github.com/rust-lang/rust-analyzer/blob/2e13684be123eca7181aa48e043e185d8044a84a/xtask/src/release.rs#L147))
42+
* `rustc-dev-guide` ([sync guide](https://github.com/rust-lang/rustc-dev-guide#synchronizing-josh-subtree-with-rustc))
4143

42-
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. If you want to migrate a subtree from `git subtree` to josh, you can check out [this guide](https://hackmd.io/7pOuxnkdQDaL1Y1FQr65xg).
44+
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. If you want to migrate a repository dependency from `git subtree` or `git submodule` to josh, you can check out [this guide](https://hackmd.io/7pOuxnkdQDaL1Y1FQr65xg).
4345

4446
Below you can find a guide on how to perform push and pull synchronization with the main rustc repo using `git subtree`, although these instructions might differ repo from repo.
4547

0 commit comments

Comments
 (0)