1
Fork 0

Use a free error code

This commit is contained in:
Alex Crichton 2017-07-29 09:05:50 -07:00
parent 9285a61413
commit cc4ff8f4d1
8 changed files with 11 additions and 11 deletions

View file

@ -821,7 +821,7 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
debug!("err_out_of_scope: opt_yield_span = {:?}", yield_span);
struct_span_err!(self.tcx.sess,
error_span,
E0624,
E0626,
"borrow may still be in use when generator yields")
.span_label(yield_span, "possible yield occurs here")
.emit();

View file

@ -1183,11 +1183,11 @@ x.x = Some(&y);
```
"##,
E0624: r##"
E0626: r##"
This error occurs because a borrow in a generator persists across a
yield point.
```compile_fail,E0624
```compile_fail,E0626
# #![feature(generators, generator_trait)]
# use std::ops::Generator;
let mut b = || {
@ -1222,7 +1222,7 @@ in those cases, something like the `Rc` or `Arc` types may be useful.
This error also frequently arises with iteration:
```compile_fail,E0624
```compile_fail,E0626
# #![feature(generators, generator_trait)]
# use std::ops::Generator;
let mut b = || {

View file

@ -3975,7 +3975,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
self.check_expr_coercable_to_type(&value, ty);
}
None => {
struct_span_err!(self.tcx.sess, expr.span, E0623,
struct_span_err!(self.tcx.sess, expr.span, E0624,
"yield statement outside of generator literal").emit();
}
}

View file

@ -4667,5 +4667,5 @@ register_diagnostics! {
E0588, // packed struct cannot transitively contain a `[repr(align)]` struct
E0592, // duplicate definitions with name `{}`
// E0613, // Removed (merged with E0609)
E0623, // yield statement outside of generator literal
E0624, // yield statement outside of generator literal
}

View file

@ -1,4 +1,4 @@
error[E0624]: borrow may still be in use when generator yields
error[E0626]: borrow may still be in use when generator yields
--> $DIR/yield-in-args-rev.rs:20:21
|
20 | foo(yield, &b); //~ ERROR

View file

@ -1,4 +1,4 @@
error[E0624]: borrow may still be in use when generator yields
error[E0626]: borrow may still be in use when generator yields
--> $DIR/yield-in-args.rs:18:14
|
18 | foo(&b, yield); //~ ERROR

View file

@ -1,4 +1,4 @@
error[E0624]: borrow may still be in use when generator yields
error[E0626]: borrow may still be in use when generator yields
--> $DIR/yield-while-iterating.rs:22:19
|
22 | for p in &x { //~ ERROR

View file

@ -1,4 +1,4 @@
error[E0624]: borrow may still be in use when generator yields
error[E0626]: borrow may still be in use when generator yields
--> $DIR/yield-while-local-borrowed.rs:22:18
|
22 | let a = &3; //~ ERROR
@ -6,7 +6,7 @@ error[E0624]: borrow may still be in use when generator yields
23 | yield();
| ------- possible yield occurs here
error[E0624]: borrow may still be in use when generator yields
error[E0626]: borrow may still be in use when generator yields
--> $DIR/yield-while-local-borrowed.rs:48:22
|
48 | let b = &a; //~ ERROR