From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/btreemap/btreemap-index-mut-2.stderr | 2 +- tests/ui/btreemap/btreemap-index-mut.stderr | 2 +- tests/ui/btreemap/btreemap_dropck.stderr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/ui/btreemap') diff --git a/tests/ui/btreemap/btreemap-index-mut-2.stderr b/tests/ui/btreemap/btreemap-index-mut-2.stderr index c8d4fd595..0b8c77cb9 100644 --- a/tests/ui/btreemap/btreemap-index-mut-2.stderr +++ b/tests/ui/btreemap/btreemap-index-mut-2.stderr @@ -14,6 +14,6 @@ LL | map.get_mut(&0).map(|val| { *val = 1; }); LL | let val = map.entry(&0).or_insert(1); | +++++++++ ~~~~~~~ ~~~~~~~~~~~~ + -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0594`. diff --git a/tests/ui/btreemap/btreemap-index-mut.stderr b/tests/ui/btreemap/btreemap-index-mut.stderr index 26f2a4c4b..cc465fbf3 100644 --- a/tests/ui/btreemap/btreemap-index-mut.stderr +++ b/tests/ui/btreemap/btreemap-index-mut.stderr @@ -14,6 +14,6 @@ LL | map.get_mut(&0).map(|val| { *val = 1; }); LL | let val = map.entry(&0).or_insert(1); | +++++++++ ~~~~~~~ ~~~~~~~~~~~~ + -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0594`. diff --git a/tests/ui/btreemap/btreemap_dropck.stderr b/tests/ui/btreemap/btreemap_dropck.stderr index d405e465a..805c2112b 100644 --- a/tests/ui/btreemap/btreemap_dropck.stderr +++ b/tests/ui/btreemap/btreemap_dropck.stderr @@ -10,6 +10,6 @@ LL | drop(s); LL | } | - borrow might be used here, when `_map` is dropped and runs the `Drop` code for type `BTreeMap` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0505`. -- cgit v1.2.3