From b8115b8f67996aae101faadadefa7bc282ec2f21 Mon Sep 17 00:00:00 2001 From: Chris Pardy Date: Sat, 16 Jan 2021 00:11:03 -0500 Subject: [PATCH] fix line numbers --- .../capture-analysis-1.stderr | 20 +++++++++---------- .../capture-analysis-2.stderr | 14 ++++++------- .../deep-multilevel-tuple.stderr | 16 +++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-1.stderr b/src/test/ui/closures/2229_closure_analysis/capture-analysis-1.stderr index f15d656be64..09255343af0 100644 --- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-1.stderr +++ b/src/test/ui/closures/2229_closure_analysis/capture-analysis-1.stderr @@ -1,5 +1,5 @@ error[E0658]: attributes on expressions are experimental - --> $DIR/capture-analysis-1.rs:18:13 + --> $DIR/capture-analysis-1.rs:17:13 | LL | let c = #[rustc_capture_analysis] | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let c = #[rustc_capture_analysis] = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable warning: the feature `capture_disjoint_fields` is incomplete and may not be safe to use and/or cause compiler crashes - --> $DIR/capture-analysis-1.rs:2:12 + --> $DIR/capture-analysis-1.rs:1:12 | LL | #![feature(capture_disjoint_fields)] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | #![feature(capture_disjoint_fields)] = note: see issue #53488 for more information error: First Pass analysis includes: - --> $DIR/capture-analysis-1.rs:21:5 + --> $DIR/capture-analysis-1.rs:20:5 | LL | / || { LL | | @@ -29,28 +29,28 @@ LL | | }; | |_____^ | note: Capturing p[] -> ImmBorrow - --> $DIR/capture-analysis-1.rs:24:26 + --> $DIR/capture-analysis-1.rs:23:26 | LL | println!("{:?}", p); | ^ note: Capturing p[(0, 0)] -> ImmBorrow - --> $DIR/capture-analysis-1.rs:27:26 + --> $DIR/capture-analysis-1.rs:26:26 | LL | println!("{:?}", p.x); | ^^^ note: Capturing q[(0, 0)] -> ImmBorrow - --> $DIR/capture-analysis-1.rs:30:26 + --> $DIR/capture-analysis-1.rs:29:26 | LL | println!("{:?}", q.x); | ^^^ note: Capturing q[] -> ImmBorrow - --> $DIR/capture-analysis-1.rs:32:26 + --> $DIR/capture-analysis-1.rs:31:26 | LL | println!("{:?}", q); | ^ error: Min Capture analysis includes: - --> $DIR/capture-analysis-1.rs:21:5 + --> $DIR/capture-analysis-1.rs:20:5 | LL | / || { LL | | @@ -62,12 +62,12 @@ LL | | }; | |_____^ | note: Min Capture p[] -> ImmBorrow - --> $DIR/capture-analysis-1.rs:24:26 + --> $DIR/capture-analysis-1.rs:23:26 | LL | println!("{:?}", p); | ^ note: Min Capture q[] -> ImmBorrow - --> $DIR/capture-analysis-1.rs:32:26 + --> $DIR/capture-analysis-1.rs:31:26 | LL | println!("{:?}", q); | ^ diff --git a/src/test/ui/closures/2229_closure_analysis/capture-analysis-2.stderr b/src/test/ui/closures/2229_closure_analysis/capture-analysis-2.stderr index 2805476d8d2..0e48d6b300b 100644 --- a/src/test/ui/closures/2229_closure_analysis/capture-analysis-2.stderr +++ b/src/test/ui/closures/2229_closure_analysis/capture-analysis-2.stderr @@ -1,5 +1,5 @@ error[E0658]: attributes on expressions are experimental - --> $DIR/capture-analysis-2.rs:17:13 + --> $DIR/capture-analysis-2.rs:16:13 | LL | let c = #[rustc_capture_analysis] | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let c = #[rustc_capture_analysis] = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable warning: the feature `capture_disjoint_fields` is incomplete and may not be safe to use and/or cause compiler crashes - --> $DIR/capture-analysis-2.rs:2:12 + --> $DIR/capture-analysis-2.rs:1:12 | LL | #![feature(capture_disjoint_fields)] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | #![feature(capture_disjoint_fields)] = note: see issue #53488 for more information error: First Pass analysis includes: - --> $DIR/capture-analysis-2.rs:20:5 + --> $DIR/capture-analysis-2.rs:19:5 | LL | / || { LL | | @@ -29,18 +29,18 @@ LL | | }; | |_____^ | note: Capturing p[(0, 0)] -> ByValue - --> $DIR/capture-analysis-2.rs:23:18 + --> $DIR/capture-analysis-2.rs:22:18 | LL | let _x = p.x; | ^^^ note: Capturing p[] -> ImmBorrow - --> $DIR/capture-analysis-2.rs:26:26 + --> $DIR/capture-analysis-2.rs:25:26 | LL | println!("{:?}", p); | ^ error: Min Capture analysis includes: - --> $DIR/capture-analysis-2.rs:20:5 + --> $DIR/capture-analysis-2.rs:19:5 | LL | / || { LL | | @@ -52,7 +52,7 @@ LL | | }; | |_____^ | note: Min Capture p[] -> ByValue - --> $DIR/capture-analysis-2.rs:23:18 + --> $DIR/capture-analysis-2.rs:22:18 | LL | let _x = p.x; | ^^^ p[] captured as ByValue here diff --git a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr b/src/test/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr index 8fce18f3d60..252db444732 100644 --- a/src/test/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr +++ b/src/test/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr @@ -1,5 +1,5 @@ error[E0658]: attributes on expressions are experimental - --> $DIR/deep-multilevel-tuple.rs:12:13 + --> $DIR/deep-multilevel-tuple.rs:11:13 | LL | let c = #[rustc_capture_analysis] | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let c = #[rustc_capture_analysis] = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable warning: the feature `capture_disjoint_fields` is incomplete and may not be safe to use and/or cause compiler crashes - --> $DIR/deep-multilevel-tuple.rs:2:12 + --> $DIR/deep-multilevel-tuple.rs:1:12 | LL | #![feature(capture_disjoint_fields)] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | #![feature(capture_disjoint_fields)] = note: see issue #53488 for more information error: First Pass analysis includes: - --> $DIR/deep-multilevel-tuple.rs:15:5 + --> $DIR/deep-multilevel-tuple.rs:14:5 | LL | / || { LL | | @@ -29,23 +29,23 @@ LL | | }; | |_____^ | note: Capturing t[(0, 0),(0, 0),(0, 0)] -> ImmBorrow - --> $DIR/deep-multilevel-tuple.rs:18:18 + --> $DIR/deep-multilevel-tuple.rs:17:18 | LL | let x = &t.0.0.0; | ^^^^^^^ note: Capturing t[(1, 0),(1, 0),(1, 0)] -> MutBorrow - --> $DIR/deep-multilevel-tuple.rs:20:9 + --> $DIR/deep-multilevel-tuple.rs:19:9 | LL | t.1.1.1 = 9; | ^^^^^^^ note: Capturing t[] -> ImmBorrow - --> $DIR/deep-multilevel-tuple.rs:23:26 + --> $DIR/deep-multilevel-tuple.rs:22:26 | LL | println!("{:?}", t); | ^ error: Min Capture analysis includes: - --> $DIR/deep-multilevel-tuple.rs:15:5 + --> $DIR/deep-multilevel-tuple.rs:14:5 | LL | / || { LL | | @@ -57,7 +57,7 @@ LL | | }; | |_____^ | note: Min Capture t[] -> MutBorrow - --> $DIR/deep-multilevel-tuple.rs:20:9 + --> $DIR/deep-multilevel-tuple.rs:19:9 | LL | t.1.1.1 = 9; | ^^^^^^^ t[] captured as MutBorrow here