Skip to content
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.

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

Rollup of 10 pull requests #89047

Merged
merged 24 commits into from
Sep 17, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ab83d50
Do not issue E0071 if a type error has already been reported
FabianWolff Sep 12, 2021
2a2bfd1
Fix handling of `hir::GenericArg::Infer` in `wrong_number_of_generic_…
FabianWolff Sep 14, 2021
21b7052
Point to closure when emitting 'cannot move out' for captured variable
FabianWolff Jul 25, 2021
4840f67
Add chown functions to std::os::unix::fs to change the owner and grou…
joshtriplett Sep 15, 2021
862d89e
Add tracking issue for unix_chown
joshtriplett Sep 15, 2021
11c0e58
Allow `panic!("{}", computed_str)` in const fn.
nbdd0121 Sep 14, 2021
9f7e281
delay error for enabling unstable lib features
vishadGoyal Sep 16, 2021
58765d6
Emit clearer diagnostics for parens around `for` loop heads
JohnTitor Jun 18, 2021
e9bf73c
Use `multipart_suggestion`
JohnTitor Sep 17, 2021
9342be5
Recover invalid assoc type bounds using `==`
JohnTitor Jul 28, 2021
ee99bb3
Apply review comments
JohnTitor Sep 17, 2021
bc49c3b
Allow to pass "compiler" arguments to doc subcommand
GuillaumeGomez Sep 5, 2021
57ee7a6
Correctly handle "--open" option when building compiler docs
GuillaumeGomez Sep 5, 2021
cd3f4da
Add rustdoc version into the help popup
GuillaumeGomez Sep 15, 2021
b6d0cca
Rollup merge of #86422 - JohnTitor:clearer-parens-err-for-loop, r=est…
GuillaumeGomez Sep 17, 2021
aed7f00
Rollup merge of #87460 - FabianWolff:issue-87456, r=Aaron1011
GuillaumeGomez Sep 17, 2021
1b78967
Rollup merge of #87566 - JohnTitor:find-eqeq-on-assoc-type-bounds, r=…
GuillaumeGomez Sep 17, 2021
765f153
Rollup merge of #88666 - GuillaumeGomez:compiler-docs, r=Mark-Simulacrum
GuillaumeGomez Sep 17, 2021
307f2dd
Rollup merge of #88899 - FabianWolff:issue-88844, r=matthewjasper
GuillaumeGomez Sep 17, 2021
6f5c098
Rollup merge of #88949 - FabianWolff:issue-87563, r=estebank
GuillaumeGomez Sep 17, 2021
723d279
Rollup merge of #88953 - joshtriplett:chown, r=dtolnay
GuillaumeGomez Sep 17, 2021
eb62779
Rollup merge of #88954 - nbdd0121:panic3, r=oli-obk
GuillaumeGomez Sep 17, 2021
833358b
Rollup merge of #88964 - GuillaumeGomez:version-help, r=Nemo157
GuillaumeGomez Sep 17, 2021
101a88f
Rollup merge of #89012 - vishadGoyal:issue-88802-fix, r=jyn514
GuillaumeGomez Sep 17, 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
Prev Previous commit
Next Next commit
Apply review comments
  • Loading branch information
JohnTitor committed Sep 17, 2021
commit ee99bb393953c31169e89597ec893fd15a3ff4ee
4 changes: 2 additions & 2 deletions compiler/rustc_parse/src/parser/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1959,11 +1959,11 @@ impl<'a> Parser<'a> {
if token::EqEq == snapshot.token.kind {
err.span_suggestion(
snapshot.token.span,
"replace `==` with `=`",
"if you meant to use an associated type binding, replace `==` with `=`",
"=".to_string(),
Applicability::MaybeIncorrect,
);
let value = self.mk_expr_err(expr.span);
let value = self.mk_expr_err(start.to(expr.span));
err.emit();
return Ok(GenericArg::Const(AnonConst { id: ast::DUMMY_NODE_ID, value }));
} else if token::Comma == self.token.kind || self.token.kind.should_end_const_arg()
Expand Down
10 changes: 6 additions & 4 deletions src/test/ui/const-generics/issues/issue-87493.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ error: expected one of `,` or `>`, found `==`
--> $DIR/issue-87493.rs:8:22
|
LL | T: MyTrait<Assoc == S::Assoc>,
| ^^
| |
| expected one of `,` or `>`
| help: replace `==` with `=`: `=`
| ^^ expected one of `,` or `>`
|
help: if you meant to use an associated type binding, replace `==` with `=`
|
LL | T: MyTrait<Assoc = S::Assoc>,
| ~

error[E0107]: this trait takes 0 generic arguments but 1 generic argument was supplied
--> $DIR/issue-87493.rs:8:8
Expand Down