Skip to content

Commit 7dbf25b

Browse files
tshepangKobzol
authored andcommitted
repetition not needed
1 parent eb70681 commit 7dbf25b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Diff for: src/external-repos.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The `rust-lang/rust` git repository depends on several other repos in the `rust-lang` organization.
44
There are three main ways we use dependencies:
55
1. As a Cargo dependency through crates.io (e.g. `rustc-rayon`)
6-
2. As a git (e.g. `clippy`) or a [josh][josh] (e.g. `miri`) subtree
6+
2. As a git (e.g. `clippy`) or a [josh] (e.g. `miri`) subtree
77
3. As a git submodule (e.g. `cargo`)
88

99
As a general rule, use crates.io for libraries that could be useful for others in the ecosystem; use
@@ -33,11 +33,11 @@ implement a new tool feature or test, that should happen in one collective rustc
3333
* `clippy` ([sync guide](https://doc.rust-lang.org/nightly/clippy/development/infrastructure/sync.html#performing-the-sync-from-rust-langrust-to-clippy))
3434
* `rustfmt`
3535
* `rustc_codegen_cranelift` ([sync script](https://github.com/rust-lang/rustc_codegen_cranelift/blob/113af154d459e41b3dc2c5d7d878e3d3a8f33c69/scripts/rustup.sh#L7))
36-
* Using the [josh][josh] tool
36+
* Using the [josh] tool
3737
* `miri` ([sync guide](https://github.com/rust-lang/miri/blob/master/CONTRIBUTING.md#advanced-topic-syncing-with-the-rustc-repo))
3838
* `rust-analyzer` ([sync script](https://github.com/rust-lang/rust-analyzer/blob/2e13684be123eca7181aa48e043e185d8044a84a/xtask/src/release.rs#L147))
3939

40-
The [josh][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).
40+
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).
4141

4242
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.
4343

Diff for: src/traits/chalk.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ stream and say hello!
1010
[Types team]: https://github.com/rust-lang/types-team
1111
[`#t-types`]: https://rust-lang.zulipchat.com/#narrow/stream/144729-t-types
1212

13-
The new-style trait solver is based on the work done in [chalk][chalk]. Chalk
13+
The new-style trait solver is based on the work done in [chalk]. Chalk
1414
recasts Rust's trait system explicitly in terms of logic programming. It does
1515
this by "lowering" Rust code into a kind of logic program we can then execute
1616
queries against.
@@ -30,7 +30,7 @@ You can read more about chalk itself in the
3030
## Ongoing work
3131
The design of the new-style trait solving happens in two places:
3232

33-
**chalk**. The [chalk][chalk] repository is where we experiment with new ideas
33+
**chalk**. The [chalk] repository is where we experiment with new ideas
3434
and designs for the trait system.
3535

3636
**rustc**. Once we are happy with the logical rules, we proceed to

0 commit comments

Comments
 (0)