diff options
| author | bors <bors@rust-lang.org> | 2025-02-11 23:55:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-11 23:55:03 +0000 |
| commit | 34a5ea911c56e79bd451c63f04ea2f5023d7d1a3 (patch) | |
| tree | 2d18f8ec79628fe1d323038ccc8509094e91e711 /src | |
| parent | 92bedea1c51e3a969d60972be854506ffd8c5cb6 (diff) | |
| parent | 89ee41cc4c9c19d56f6c30da5c8883f87019a90b (diff) | |
| download | rust-34a5ea911c56e79bd451c63f04ea2f5023d7d1a3.tar.gz rust-34a5ea911c56e79bd451c63f04ea2f5023d7d1a3.zip | |
Auto merge of #136878 - matthiaskrgr:rollup-opilhjv, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #135285 (it-self → itself, build-system → build system, type-alias → type alias) - #135677 (Small `rustc_resolve` cleanups) - #136239 (show supported register classes in error message) - #136246 (include note on variance and example) - #136354 (Update docs for impl keyword) - #136786 (Remove the deduplicate_blocks pass) - #136833 (compiler: die immediately instead of handling unknown target codegen) - #136847 (Simplify intra-crate qualifiers.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/rustc/src/check-cfg.md | 2 | ||||
| -rw-r--r-- | src/librustdoc/passes/strip_aliased_non_local.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/rustc/src/check-cfg.md b/src/doc/rustc/src/check-cfg.md index c62ca9fd9ad..00add2651ae 100644 --- a/src/doc/rustc/src/check-cfg.md +++ b/src/doc/rustc/src/check-cfg.md @@ -135,7 +135,7 @@ As of `2025-01-02T`, the list of known names is as follows: - `windows` > Starting with 1.85.0, the `test` cfg is consider to be a "userspace" config -> despite being also set by `rustc` and should be managed by the build-system it-self. +> despite being also set by `rustc` and should be managed by the build system itself. Like with `values(any())`, well known names checking can be disabled by passing `cfg(any())` as argument to `--check-cfg`. diff --git a/src/librustdoc/passes/strip_aliased_non_local.rs b/src/librustdoc/passes/strip_aliased_non_local.rs index fa7737bc143..7f5c7da3634 100644 --- a/src/librustdoc/passes/strip_aliased_non_local.rs +++ b/src/librustdoc/passes/strip_aliased_non_local.rs @@ -26,7 +26,7 @@ impl DocFolder for AliasedNonLocalStripper<'_> { Some(match i.kind { clean::TypeAliasItem(..) => { let mut stripper = NonLocalStripper { tcx: self.tcx }; - // don't call `fold_item` as that could strip the type-alias it-self + // don't call `fold_item` as that could strip the type alias itself // which we don't want to strip out stripper.fold_item_recur(i) } |
