From cc4ff8f4d169562ff4ae22b94197a191215e6d56 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 29 Jul 2017 09:05:50 -0700 Subject: [PATCH] Use a free error code --- src/librustc_borrowck/borrowck/mod.rs | 2 +- src/librustc_borrowck/diagnostics.rs | 6 +++--- src/librustc_typeck/check/mod.rs | 2 +- src/librustc_typeck/diagnostics.rs | 2 +- src/test/ui/generator/yield-in-args-rev.stderr | 2 +- src/test/ui/generator/yield-in-args.stderr | 2 +- src/test/ui/generator/yield-while-iterating.stderr | 2 +- src/test/ui/generator/yield-while-local-borrowed.stderr | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs index 820761603cd6..0016c406b375 100644 --- a/src/librustc_borrowck/borrowck/mod.rs +++ b/src/librustc_borrowck/borrowck/mod.rs @@ -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(); diff --git a/src/librustc_borrowck/diagnostics.rs b/src/librustc_borrowck/diagnostics.rs index 3987799ceb61..5d8998b332dc 100644 --- a/src/librustc_borrowck/diagnostics.rs +++ b/src/librustc_borrowck/diagnostics.rs @@ -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 = || { diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 7d3cfb448ca6..67ffca69efaf 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -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(); } } diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index b646678d7d2e..7c410b111c2f 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -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 } diff --git a/src/test/ui/generator/yield-in-args-rev.stderr b/src/test/ui/generator/yield-in-args-rev.stderr index eb7cc04b71ac..157f89682090 100644 --- a/src/test/ui/generator/yield-in-args-rev.stderr +++ b/src/test/ui/generator/yield-in-args-rev.stderr @@ -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 diff --git a/src/test/ui/generator/yield-in-args.stderr b/src/test/ui/generator/yield-in-args.stderr index 7a7e92ac5fad..06561853dee8 100644 --- a/src/test/ui/generator/yield-in-args.stderr +++ b/src/test/ui/generator/yield-in-args.stderr @@ -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 diff --git a/src/test/ui/generator/yield-while-iterating.stderr b/src/test/ui/generator/yield-while-iterating.stderr index 775c36a3df40..ea55e032e476 100644 --- a/src/test/ui/generator/yield-while-iterating.stderr +++ b/src/test/ui/generator/yield-while-iterating.stderr @@ -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 diff --git a/src/test/ui/generator/yield-while-local-borrowed.stderr b/src/test/ui/generator/yield-while-local-borrowed.stderr index 1e333a33db62..46363e5919d3 100644 --- a/src/test/ui/generator/yield-while-local-borrowed.stderr +++ b/src/test/ui/generator/yield-while-local-borrowed.stderr @@ -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