Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 6 pull requests #84153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Apr 13, 2021
Merged

Rollup of 6 pull requests #84153

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
64cf7ad
Update RELEASES.md
CDirkx Mar 24, 2021
58218f6
Remove T: Debug bound on UnsafeCell Debug impl
exrook Mar 31, 2021
7baeaa9
Stabilize BTree{Map,Set}::retain
workingjubilee Apr 12, 2021
d1e23b8
Stabilize duration_zero.
m-ou-se Apr 11, 2021
b44ae96
Mark Duration::is_zero as rustc_const_stable.
m-ou-se Apr 11, 2021
dd54459
don't bump in check_mistyped_turbofish_with_multiple_type_params
b-naber Apr 12, 2021
4dfaa78
add test
b-naber Apr 12, 2021
1e26358
Fix typo in error message
camelid Apr 12, 2021
9191dee
Rollup merge of #83438 - CDirkx:releases, r=Mark-Simulacrum
Dylan-DPC Apr 13, 2021
1cc4b6d
Rollup merge of #83707 - exrook:unsafecell, r=m-ou-se
Dylan-DPC Apr 13, 2021
3d6a364
Rollup merge of #84084 - m-ou-se:stabilize-zero, r=scottmcm
Dylan-DPC Apr 13, 2021
cf67c9b
Rollup merge of #84121 - workingjubilee:stabilize-btree-retain, r=dto…
Dylan-DPC Apr 13, 2021
e40d7e6
Rollup merge of #84140 - b-naber:parser_past_eof, r=varkor
Dylan-DPC Apr 13, 2021
91c0828
Rollup merge of #84141 - camelid:fix-typo, r=Dylan-DPC
Dylan-DPC Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_typeck/src/astconv/generics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
if param_type.is_suggestable() {
err.span_suggestion(
tcx.def_span(src_def_id),
"consider changing this type paramater to a `const`-generic",
"consider changing this type parameter to be a `const` generic",
format!("const {}: {}", param_name, param_type),
Applicability::MaybeIncorrect,
);
Expand Down
9 changes: 6 additions & 3 deletions src/test/ui/const-generics/diagnostics.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ error[E0747]: type provided when a constant was expected
--> $DIR/diagnostics.rs:12:19
|
LL | impl<N> Foo for B<N> {}
| - ^
| |
| help: consider changing this type paramater to a `const`-generic: `const N: u8`
| ^
|
help: consider changing this type parameter to be a `const` generic
|
LL | impl<const N: u8> Foo for B<N> {}
| ^^^^^^^^^^^

error[E0747]: unresolved item provided when a constant was expected
--> $DIR/diagnostics.rs:16:32
Expand Down