Skip to content

Commit 3899914

Browse files
RalfJungRalfJung
committed
bless after rebase
1 parent af58692 commit 3899914

16 files changed

+750
-23
lines changed

‎src/test/ui/borrowck/issue-81899.stderr

+13
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,16 @@ LL | const _CONST: &[u8] = &f(&[], |_| {});
2727
error: aborting due to 2 previous errors
2828

2929
For more information about this error, try `rustc --explain E0080`.
30+
Future incompatibility report: Future breakage diagnostic:
31+
error: any use of this value will cause an error
32+
--> $DIR/issue-81899.rs:4:23
33+
|
34+
LL | const _CONST: &[u8] = &f(&[], |_| {});
35+
| ----------------------^^^^^^^^^^^^^^^-
36+
| |
37+
| referenced constant has errors
38+
|
39+
= note: `#[deny(const_err)]` on by default
40+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
41+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
42+

‎src/test/ui/borrowck/issue-88434-minimal-example.stderr

+13
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,16 @@ LL | const _CONST: &() = &f(&|_| {});
2727
error: aborting due to 2 previous errors
2828

2929
For more information about this error, try `rustc --explain E0080`.
30+
Future incompatibility report: Future breakage diagnostic:
31+
error: any use of this value will cause an error
32+
--> $DIR/issue-88434-minimal-example.rs:3:21
33+
|
34+
LL | const _CONST: &() = &f(&|_| {});
35+
| --------------------^^^^^^^^^^^-
36+
| |
37+
| referenced constant has errors
38+
|
39+
= note: `#[deny(const_err)]` on by default
40+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
41+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
42+

‎src/test/ui/borrowck/issue-88434-removal-index-should-be-less.stderr

+13
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,16 @@ LL | const _CONST: &[u8] = &f(&[], |_| {});
2727
error: aborting due to 2 previous errors
2828

2929
For more information about this error, try `rustc --explain E0080`.
30+
Future incompatibility report: Future breakage diagnostic:
31+
error: any use of this value will cause an error
32+
--> $DIR/issue-88434-removal-index-should-be-less.rs:3:23
33+
|
34+
LL | const _CONST: &[u8] = &f(&[], |_| {});
35+
| ----------------------^^^^^^^^^^^^^^^-
36+
| |
37+
| referenced constant has errors
38+
|
39+
= note: `#[deny(const_err)]` on by default
40+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
41+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
42+

‎src/test/ui/consts/const-eval/const-eval-query-stack.stderr

+13-2
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,29 @@ query stack during panic:
3737
end of query stack
3838
Future incompatibility report: Future breakage diagnostic:
3939
warning: any use of this value will cause an error
40-
--> $DIR/const-eval-query-stack.rs:20:16
40+
--> $DIR/const-eval-query-stack.rs:19:16
4141
|
4242
LL | const X: i32 = 1 / 0;
4343
| ---------------^^^^^-
4444
| |
4545
| attempt to divide `1_i32` by zero
4646
|
4747
note: the lint level is defined here
48-
--> $DIR/const-eval-query-stack.rs:19:8
48+
--> $DIR/const-eval-query-stack.rs:18:8
4949
|
5050
LL | #[warn(const_err)]
5151
| ^^^^^^^^^
5252
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
5353
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
5454

55+
Future breakage diagnostic:
56+
error: erroneous constant used
57+
--> $DIR/const-eval-query-stack.rs:23:27
58+
|
59+
LL | let x: &'static i32 = &X;
60+
| ^^ referenced constant has errors
61+
|
62+
= note: `#[deny(const_err)]` on by default
63+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
64+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
65+

‎src/test/ui/consts/const-eval/const-pointer-values-in-various-types.64bit.stderr

+111-20
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,20 @@ error: aborting due to 29 previous errors
323323
For more information about this error, try `rustc --explain E0080`.
324324
Future incompatibility report: Future breakage diagnostic:
325325
error: any use of this value will cause an error
326-
--> $DIR/const-pointer-values-in-various-types.rs:29:43
326+
--> $DIR/const-pointer-values-in-various-types.rs:26:49
327+
|
328+
LL | const I32_REF_USIZE_UNION: usize = unsafe { Nonsense { int_32_ref: &3 }.u };
329+
| --------------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
330+
| |
331+
| unable to turn pointer into raw bytes
332+
|
333+
= note: `#[deny(const_err)]` on by default
334+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
335+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
336+
337+
Future breakage diagnostic:
338+
error: any use of this value will cause an error
339+
--> $DIR/const-pointer-values-in-various-types.rs:30:43
327340
|
328341
LL | const I32_REF_U8_UNION: u8 = unsafe { Nonsense { int_32_ref: &3 }.uint_8 };
329342
| --------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -336,7 +349,7 @@ LL | const I32_REF_U8_UNION: u8 = unsafe { Nonsense { int_32_ref: &3 }.uint_
336349

337350
Future breakage diagnostic:
338351
error: any use of this value will cause an error
339-
--> $DIR/const-pointer-values-in-various-types.rs:33:45
352+
--> $DIR/const-pointer-values-in-various-types.rs:34:45
340353
|
341354
LL | const I32_REF_U16_UNION: u16 = unsafe { Nonsense { int_32_ref: &3 }.uint_16 };
342355
| ----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -349,7 +362,7 @@ LL | const I32_REF_U16_UNION: u16 = unsafe { Nonsense { int_32_ref: &3 }.uin
349362

350363
Future breakage diagnostic:
351364
error: any use of this value will cause an error
352-
--> $DIR/const-pointer-values-in-various-types.rs:37:45
365+
--> $DIR/const-pointer-values-in-various-types.rs:38:45
353366
|
354367
LL | const I32_REF_U32_UNION: u32 = unsafe { Nonsense { int_32_ref: &3 }.uint_32 };
355368
| ----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -362,7 +375,20 @@ LL | const I32_REF_U32_UNION: u32 = unsafe { Nonsense { int_32_ref: &3 }.uin
362375

363376
Future breakage diagnostic:
364377
error: any use of this value will cause an error
365-
--> $DIR/const-pointer-values-in-various-types.rs:47:43
378+
--> $DIR/const-pointer-values-in-various-types.rs:42:45
379+
|
380+
LL | const I32_REF_U64_UNION: u64 = unsafe { Nonsense { int_32_ref: &3 }.uint_64 };
381+
| ----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
382+
| |
383+
| unable to turn pointer into raw bytes
384+
|
385+
= note: `#[deny(const_err)]` on by default
386+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
387+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
388+
389+
Future breakage diagnostic:
390+
error: any use of this value will cause an error
391+
--> $DIR/const-pointer-values-in-various-types.rs:49:43
366392
|
367393
LL | const I32_REF_I8_UNION: i8 = unsafe { Nonsense { int_32_ref: &3 }.int_8 };
368394
| --------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -375,7 +401,7 @@ LL | const I32_REF_I8_UNION: i8 = unsafe { Nonsense { int_32_ref: &3 }.int_8
375401

376402
Future breakage diagnostic:
377403
error: any use of this value will cause an error
378-
--> $DIR/const-pointer-values-in-various-types.rs:51:45
404+
--> $DIR/const-pointer-values-in-various-types.rs:53:45
379405
|
380406
LL | const I32_REF_I16_UNION: i16 = unsafe { Nonsense { int_32_ref: &3 }.int_16 };
381407
| ----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -388,7 +414,7 @@ LL | const I32_REF_I16_UNION: i16 = unsafe { Nonsense { int_32_ref: &3 }.int
388414

389415
Future breakage diagnostic:
390416
error: any use of this value will cause an error
391-
--> $DIR/const-pointer-values-in-various-types.rs:55:45
417+
--> $DIR/const-pointer-values-in-various-types.rs:57:45
392418
|
393419
LL | const I32_REF_I32_UNION: i32 = unsafe { Nonsense { int_32_ref: &3 }.int_32 };
394420
| ----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -401,7 +427,20 @@ LL | const I32_REF_I32_UNION: i32 = unsafe { Nonsense { int_32_ref: &3 }.int
401427

402428
Future breakage diagnostic:
403429
error: any use of this value will cause an error
404-
--> $DIR/const-pointer-values-in-various-types.rs:65:45
430+
--> $DIR/const-pointer-values-in-various-types.rs:61:45
431+
|
432+
LL | const I32_REF_I64_UNION: i64 = unsafe { Nonsense { int_32_ref: &3 }.int_64 };
433+
| ----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
434+
| |
435+
| unable to turn pointer into raw bytes
436+
|
437+
= note: `#[deny(const_err)]` on by default
438+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
439+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
440+
441+
Future breakage diagnostic:
442+
error: any use of this value will cause an error
443+
--> $DIR/const-pointer-values-in-various-types.rs:68:45
405444
|
406445
LL | const I32_REF_F32_UNION: f32 = unsafe { Nonsense { int_32_ref: &3 }.float_32 };
407446
| ----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -414,7 +453,20 @@ LL | const I32_REF_F32_UNION: f32 = unsafe { Nonsense { int_32_ref: &3 }.flo
414453

415454
Future breakage diagnostic:
416455
error: any use of this value will cause an error
417-
--> $DIR/const-pointer-values-in-various-types.rs:72:47
456+
--> $DIR/const-pointer-values-in-various-types.rs:72:45
457+
|
458+
LL | const I32_REF_F64_UNION: f64 = unsafe { Nonsense { int_32_ref: &3 }.float_64 };
459+
| ----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
460+
| |
461+
| unable to turn pointer into raw bytes
462+
|
463+
= note: `#[deny(const_err)]` on by default
464+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
465+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
466+
467+
Future breakage diagnostic:
468+
error: any use of this value will cause an error
469+
--> $DIR/const-pointer-values-in-various-types.rs:76:47
418470
|
419471
LL | const I32_REF_BOOL_UNION: bool = unsafe { Nonsense { int_32_ref: &3 }.truthy_falsey };
420472
| ------------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -427,7 +479,7 @@ LL | const I32_REF_BOOL_UNION: bool = unsafe { Nonsense { int_32_ref: &3 }.t
427479

428480
Future breakage diagnostic:
429481
error: any use of this value will cause an error
430-
--> $DIR/const-pointer-values-in-various-types.rs:76:47
482+
--> $DIR/const-pointer-values-in-various-types.rs:80:47
431483
|
432484
LL | const I32_REF_CHAR_UNION: char = unsafe { Nonsense { int_32_ref: &3 }.character };
433485
| ------------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -440,7 +492,7 @@ LL | const I32_REF_CHAR_UNION: char = unsafe { Nonsense { int_32_ref: &3 }.c
440492

441493
Future breakage diagnostic:
442494
error: any use of this value will cause an error
443-
--> $DIR/const-pointer-values-in-various-types.rs:80:39
495+
--> $DIR/const-pointer-values-in-various-types.rs:84:39
444496
|
445497
LL | const STR_U8_UNION: u8 = unsafe { Nonsense { stringy: "3" }.uint_8 };
446498
| ----------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -453,7 +505,7 @@ LL | const STR_U8_UNION: u8 = unsafe { Nonsense { stringy: "3" }.uint_8 };
453505

454506
Future breakage diagnostic:
455507
error: any use of this value will cause an error
456-
--> $DIR/const-pointer-values-in-various-types.rs:84:41
508+
--> $DIR/const-pointer-values-in-various-types.rs:88:41
457509
|
458510
LL | const STR_U16_UNION: u16 = unsafe { Nonsense { stringy: "3" }.uint_16 };
459511
| ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -466,7 +518,7 @@ LL | const STR_U16_UNION: u16 = unsafe { Nonsense { stringy: "3" }.uint_16 }
466518

467519
Future breakage diagnostic:
468520
error: any use of this value will cause an error
469-
--> $DIR/const-pointer-values-in-various-types.rs:88:41
521+
--> $DIR/const-pointer-values-in-various-types.rs:92:41
470522
|
471523
LL | const STR_U32_UNION: u32 = unsafe { Nonsense { stringy: "3" }.uint_32 };
472524
| ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -479,7 +531,20 @@ LL | const STR_U32_UNION: u32 = unsafe { Nonsense { stringy: "3" }.uint_32 }
479531

480532
Future breakage diagnostic:
481533
error: any use of this value will cause an error
482-
--> $DIR/const-pointer-values-in-various-types.rs:95:43
534+
--> $DIR/const-pointer-values-in-various-types.rs:96:41
535+
|
536+
LL | const STR_U64_UNION: u64 = unsafe { Nonsense { stringy: "3" }.uint_64 };
537+
| ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
538+
| |
539+
| unable to turn pointer into raw bytes
540+
|
541+
= note: `#[deny(const_err)]` on by default
542+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
543+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
544+
545+
Future breakage diagnostic:
546+
error: any use of this value will cause an error
547+
--> $DIR/const-pointer-values-in-various-types.rs:100:43
483548
|
484549
LL | const STR_U128_UNION: u128 = unsafe { Nonsense { stringy: "3" }.uint_128 };
485550
| --------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -492,7 +557,7 @@ LL | const STR_U128_UNION: u128 = unsafe { Nonsense { stringy: "3" }.uint_12
492557

493558
Future breakage diagnostic:
494559
error: any use of this value will cause an error
495-
--> $DIR/const-pointer-values-in-various-types.rs:99:39
560+
--> $DIR/const-pointer-values-in-various-types.rs:104:39
496561
|
497562
LL | const STR_I8_UNION: i8 = unsafe { Nonsense { stringy: "3" }.int_8 };
498563
| ----------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -505,7 +570,7 @@ LL | const STR_I8_UNION: i8 = unsafe { Nonsense { stringy: "3" }.int_8 };
505570

506571
Future breakage diagnostic:
507572
error: any use of this value will cause an error
508-
--> $DIR/const-pointer-values-in-various-types.rs:103:41
573+
--> $DIR/const-pointer-values-in-various-types.rs:108:41
509574
|
510575
LL | const STR_I16_UNION: i16 = unsafe { Nonsense { stringy: "3" }.int_16 };
511576
| ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -518,7 +583,7 @@ LL | const STR_I16_UNION: i16 = unsafe { Nonsense { stringy: "3" }.int_16 };
518583

519584
Future breakage diagnostic:
520585
error: any use of this value will cause an error
521-
--> $DIR/const-pointer-values-in-various-types.rs:107:41
586+
--> $DIR/const-pointer-values-in-various-types.rs:112:41
522587
|
523588
LL | const STR_I32_UNION: i32 = unsafe { Nonsense { stringy: "3" }.int_32 };
524589
| ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -531,7 +596,20 @@ LL | const STR_I32_UNION: i32 = unsafe { Nonsense { stringy: "3" }.int_32 };
531596

532597
Future breakage diagnostic:
533598
error: any use of this value will cause an error
534-
--> $DIR/const-pointer-values-in-various-types.rs:114:43
599+
--> $DIR/const-pointer-values-in-various-types.rs:116:41
600+
|
601+
LL | const STR_I64_UNION: i64 = unsafe { Nonsense { stringy: "3" }.int_64 };
602+
| ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
603+
| |
604+
| unable to turn pointer into raw bytes
605+
|
606+
= note: `#[deny(const_err)]` on by default
607+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
608+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
609+
610+
Future breakage diagnostic:
611+
error: any use of this value will cause an error
612+
--> $DIR/const-pointer-values-in-various-types.rs:120:43
535613
|
536614
LL | const STR_I128_UNION: i128 = unsafe { Nonsense { stringy: "3" }.int_128 };
537615
| --------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -544,7 +622,7 @@ LL | const STR_I128_UNION: i128 = unsafe { Nonsense { stringy: "3" }.int_128
544622

545623
Future breakage diagnostic:
546624
error: any use of this value will cause an error
547-
--> $DIR/const-pointer-values-in-various-types.rs:118:41
625+
--> $DIR/const-pointer-values-in-various-types.rs:124:41
548626
|
549627
LL | const STR_F32_UNION: f32 = unsafe { Nonsense { stringy: "3" }.float_32 };
550628
| ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -557,7 +635,20 @@ LL | const STR_F32_UNION: f32 = unsafe { Nonsense { stringy: "3" }.float_32
557635

558636
Future breakage diagnostic:
559637
error: any use of this value will cause an error
560-
--> $DIR/const-pointer-values-in-various-types.rs:125:43
638+
--> $DIR/const-pointer-values-in-various-types.rs:128:41
639+
|
640+
LL | const STR_F64_UNION: f64 = unsafe { Nonsense { stringy: "3" }.float_64 };
641+
| ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
642+
| |
643+
| unable to turn pointer into raw bytes
644+
|
645+
= note: `#[deny(const_err)]` on by default
646+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
647+
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
648+
649+
Future breakage diagnostic:
650+
error: any use of this value will cause an error
651+
--> $DIR/const-pointer-values-in-various-types.rs:132:43
561652
|
562653
LL | const STR_BOOL_UNION: bool = unsafe { Nonsense { stringy: "3" }.truthy_falsey };
563654
| --------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -570,7 +661,7 @@ LL | const STR_BOOL_UNION: bool = unsafe { Nonsense { stringy: "3" }.truthy_
570661

571662
Future breakage diagnostic:
572663
error: any use of this value will cause an error
573-
--> $DIR/const-pointer-values-in-various-types.rs:129:43
664+
--> $DIR/const-pointer-values-in-various-types.rs:136:43
574665
|
575666
LL | const STR_CHAR_UNION: char = unsafe { Nonsense { stringy: "3" }.character };
576667
| --------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---

0 commit comments

Comments
 (0)