Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Merge branch 'master' into E0688
  • Loading branch information
Polkaverse committed Jul 13, 2020
commit bc2b37aad7f9cbd1c97e416e6b16325b607422b8
2 changes: 1 addition & 1 deletion src/librustc_error_codes/error_codes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ E0668: include_str!("./error_codes/E0668.md"),
E0669: include_str!("./error_codes/E0669.md"),
E0670: include_str!("./error_codes/E0670.md"),
E0671: include_str!("./error_codes/E0671.md"),
E0687: include_str!("./error_codes/E0687.md"),
E0688: include_str!("./error_codes/E0688.md"),
E0689: include_str!("./error_codes/E0689.md"),
E0690: include_str!("./error_codes/E0690.md"),
Expand Down Expand Up @@ -616,7 +617,6 @@ E0768: include_str!("./error_codes/E0768.md"),
E0640, // infer outlives requirements
// E0645, // trait aliases not finished
E0667, // `impl Trait` in projections
E0687, // in-band lifetimes cannot be used in `fn`/`Fn` syntax
// E0694, // an unknown tool name found in scoped attributes
// E0702, // replaced with a generic attribute input check
// E0707, // multiple elided lifetimes used in arguments of `async fn`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/in-band-lifetimes/E0688.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ LL | impl<'b> Foo<'a> {

error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0688`.
For more information about this error, try `rustc --explain E0688`.
You are viewing a condensed version of this merge commit. You can view the full changes here.