Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0a199e4

Browse files
committedSep 11, 2023
Auto merge of #115758 - matthiaskrgr:rollup-khwbjj7, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #115335 (fix overflow in array length computation) - #115440 (bootstrap/format: remove unnecessary paths.push) - #115702 (Update mailmap) - #115727 (Implement fallback for effect param) - #115739 (Call `LateLintPass::check_attribute` from `with_lint_attrs`) - #115743 (Point out if a local trait has no implementations) - #115744 (Improve diagnostic for generic params from outer items (E0401)) - #115752 (rustdoc: Add missing "Aliased type" title in the sidebar) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3ebb562 + 9ed6eea commit 0a199e4

File tree

140 files changed

+1413
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1413
-299
lines changed
 

‎.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ Gareth Daniel Smith <garethdanielsmith@gmail.com> gareth <gareth@gareth-N56VM.(n
205205
Gareth Daniel Smith <garethdanielsmith@gmail.com> Gareth Smith <garethdanielsmith@gmail.com>
206206
Gauri Kholkar <f2013002@goa.bits-pilani.ac.in>
207207
Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
208+
Ghost <ghost> <jonasschievink@gmail.com>
209+
Ghost <ghost> <jonas.schievink@ferrous-systems.com>
210+
Ghost <ghost> <jonas@schievink.net>
211+
Ghost <ghost> <Jonas.Schievink@sony.com>
208212
Giles Cope <gilescope@gmail.com>
209213
Glen De Cauwsemaecker <decauwsemaecker.glen@gmail.com>
210214
Graham Fawcett <graham.fawcett@gmail.com> Graham Fawcett <fawcett@uwindsor.ca>

‎compiler/rustc_error_codes/src/error_codes/E0401.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Inner items do not inherit type or const parameters from the functions
1+
Inner items do not inherit the generic parameters from the items
22
they are embedded in.
33

44
Erroneous code example:
@@ -32,8 +32,8 @@ fn foo<T>(x: T) {
3232
}
3333
```
3434

35-
Items inside functions are basically just like top-level items, except
36-
that they can only be used from the function they are in.
35+
Items nested inside other items are basically just like top-level items, except
36+
that they can only be used from the item they are in.
3737

3838
There are a couple of solutions for this.
3939

0 commit comments

Comments
 (0)