const_block_items: tests

Author: GrigorenkoPV

compiler/rustc_ast/src/ast.rs

@@ -3836,7 +3836,7 @@ pub enum ItemKind {
     /// E.g., `const FOO: i32 = 42;`.
     Const(Box<ConstItem>),
     /// A module-level const block.
-    /// Equivalent to `const _: () = const { ... }`.
+    /// Equivalent to `const _: () = const { ... };`.
     ///
     /// E.g., `const { assert!(true) }`.
     ConstBlock(ConstBlockItem),

compiler/rustc_parse/src/parser/tests.rs

@@ -22,7 +22,7 @@ use rustc_span::{
 };
 
 use crate::lexer::StripTokens;
-use crate::parser::{ForceCollect, Parser};
+use crate::parser::{AllowConstBlockItems, ForceCollect, Parser};
 use crate::{new_parser_from_source_str, source_str_to_stream, unwrap_or_emit_fatal};
 
 fn psess() -> ParseSess {
@@ -2239,7 +2239,7 @@ fn parse_item_from_source_str(
     psess: &ParseSess,
 ) -> PResult<'_, Option<Box<ast::Item>>> {
     unwrap_or_emit_fatal(new_parser_from_source_str(psess, name, source, StripTokens::Nothing))
-        .parse_item(ForceCollect::No)
+        .parse_item(ForceCollect::No, AllowConstBlockItems::Yes)
 }
 
 // Produces a `rustc_span::span`.
@@ -2254,7 +2254,9 @@ fn string_to_expr(source_str: String) -> Box<ast::Expr> {
 
 /// Parses a string, returns an item.
 fn string_to_item(source_str: String) -> Option<Box<ast::Item>> {
-    with_error_checking_parse(source_str, &psess(), |p| p.parse_item(ForceCollect::No))
+    with_error_checking_parse(source_str, &psess(), |p| {
+        p.parse_item(ForceCollect::No, AllowConstBlockItems::Yes)
+    })
 }
 
 #[test]

tests/ui/consts/const-block-items/assert-fail.rs

@@ -0,0 +1,10 @@
+//@ check-fail
+
+#![feature(const_block_items)]
+
+const { assert!(false) }
+//~^ ERROR: evaluation panicked: assertion failed: false [E0080]
+const { assert!(2 + 2 == 5) }
+//~^ ERROR: evaluation panicked: assertion failed: 2 + 2 == 5 [E0080]
+
+fn main() {}

tests/ui/consts/const-block-items/assert-fail.stderr

@@ -0,0 +1,27 @@
+error[E0080]: evaluation panicked: assertion failed: false
+  --> $DIR/assert-fail.rs:5:9
+   |
+LL | const { assert!(false) }
+   |         ^^^^^^^^^^^^^^ evaluation of `_::{constant#0}` failed here
+
+note: erroneous constant encountered
+  --> $DIR/assert-fail.rs:5:1
+   |
+LL | const { assert!(false) }
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0080]: evaluation panicked: assertion failed: 2 + 2 == 5
+  --> $DIR/assert-fail.rs:7:9
+   |
+LL | const { assert!(2 + 2 == 5) }
+   |         ^^^^^^^^^^^^^^^^^^^ evaluation of `_::{constant#0}` failed here
+
+note: erroneous constant encountered
+  --> $DIR/assert-fail.rs:7:1
+   |
+LL | const { assert!(2 + 2 == 5) }
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0080`.

tests/ui/consts/const-block-items/assert-pass.rs

@@ -0,0 +1,7 @@
+//@ check-pass
+#![feature(const_block_items)]
+
+const { assert!(true) }
+const { assert!(2 + 2 == 4) }
+
+fn main() {}

tests/ui/consts/const-block-items/typecheck.rs

@@ -0,0 +1,20 @@
+//@ check-fail
+
+#![feature(const_block_items)]
+
+const {
+    assert!(true);
+    2 + 2 //~ ERROR: mismatched types [E0308]
+}
+
+
+const fn id<T>(t: T) -> T {
+    t
+}
+
+const { id(2) }
+//~^ ERROR: mismatched types [E0308]
+const { id(()) }
+
+
+fn main() {}

tests/ui/consts/const-block-items/typecheck.stderr

@@ -0,0 +1,30 @@
+error[E0308]: mismatched types
+  --> $DIR/typecheck.rs:7:5
+   |
+LL |     2 + 2
+   |     ^^^^^ expected `()`, found integer
+
+error[E0308]: mismatched types
+  --> $DIR/typecheck.rs:15:12
+   |
+LL | const { id(2) }
+   |         -- ^ expected `()`, found integer
+   |         |
+   |         arguments to this function are incorrect
+   |
+help: the return type of this call is `{integer}` due to the type of the argument passed
+  --> $DIR/typecheck.rs:15:9
+   |
+LL | const { id(2) }
+   |         ^^^-^
+   |            |
+   |            this argument influences the return type of `id`
+note: function defined here
+  --> $DIR/typecheck.rs:11:10
+   |
+LL | const fn id<T>(t: T) -> T {
+   |          ^^    ----
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.

…consts/const-block-item-macro-codegen.rs …st-item-with-block-body/macro-codegen.rstests/ui/consts/const-block-item-macro-codegen.rs renamed to tests/ui/consts/const-item-with-block-body/macro-codegen.rs tests/ui/consts/const-block-item-macro-codegen.rs renamed to tests/ui/consts/const-item-with-block-body/macro-codegen.rs

@@ -1,5 +1,5 @@
 warning: trait `Value` is never used
-  --> $DIR/const-block-item.rs:5:15
+  --> $DIR/static.rs:5:15
    |
 LL |     pub trait Value {
    |               ^^^^^