rust-analyzer

diff --git a/crates/hir-def/src/generics.rs b/crates/hir-def/src/generics.rs
index 531a503c1b..7ee27d2670 100644
--- a/crates/hir-def/src/generics.rs
+++ b/crates/hir-def/src/generics.rs

@@ -307,7 +307,7 @@ impl GenericParams {

let param = ConstParamData {

name,

ty: Interned::new(ty),

- default: ConstRef::from_default_param_value(lower_ctx, const_param),

+ default: ConstRef::from_const_param(lower_ctx, const_param),

};

let idx = self.type_or_consts.alloc(param.into());

add_param_attrs(idx.into(), ast::GenericParam::ConstParam(const_param));

diff --git a/crates/hir-def/src/hir/type_ref.rs b/crates/hir-def/src/hir/type_ref.rs
index e2d24625ce..c518f1b75b 100644
--- a/crates/hir-def/src/hir/type_ref.rs
+++ b/crates/hir-def/src/hir/type_ref.rs

@@ -393,15 +393,15 @@ impl ConstRef {

Self::Scalar(LiteralConstRef::Unknown)

}

- pub(crate) fn from_default_param_value(

- _: &LowerCtx<'_>,

+ pub(crate) fn from_const_param(

+ lower_ctx: &LowerCtx<'_>,

param: ast::ConstParam,

) -> Option<Self> {

- if let Some(expr) = param.default_val() {

- // FIXME: pass the `ast_id` arg to recognize complex expressions

- return Some(Self::from_expr(expr, None));

+ let default = param.default_val();

+ match default {

+ Some(_) => Some(Self::from_const_arg(lower_ctx, default)),

+ None => None,

}

- None

}

pub fn display<'a>(&'a self, db: &'a dyn ExpandDatabase) -> impl fmt::Display + 'a {

diff --git a/crates/hir-ty/src/lib.rs b/crates/hir-ty/src/lib.rs
index 1595622d2b..14346c2794 100644
--- a/crates/hir-ty/src/lib.rs
+++ b/crates/hir-ty/src/lib.rs

@@ -723,6 +723,10 @@ where

pub fn known_const_to_string(konst: &Const, db: &dyn HirDatabase) -> Option<String> {

if let ConstValue::Concrete(c) = &konst.interned().value {

+ if let ConstScalar::UnevaluatedConst(GeneralConstId::InTypeConstId(_), _) = &c.interned {

+ // FIXME: stringify the block expression

+ return None;

+ }

if c.interned == ConstScalar::Unknown {

return None;

}

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index b577b3fb32..136b1b0853 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs

@@ -62,7 +62,8 @@ use hir_expand::{name::name, MacroCallKind};

use hir_ty::{

all_super_traits, autoderef,

consteval::{try_const_usize, unknown_const_as_generic, ConstEvalError, ConstExt},

- diagnostics::BodyValidationDiagnostic, known_const_to_string,

+ diagnostics::BodyValidationDiagnostic,

+ known_const_to_string,

layout::{Layout as TyLayout, RustcEnumVariantIdx, TagEncoding},

method_resolution::{self, TyFingerprint},

mir::{self, interpret_mir},

diff --git a/crates/ide-assists/src/handlers/extract_function.rs b/crates/ide-assists/src/handlers/extract_function.rs
index 7f61a68284..1340681cca 100644
--- a/crates/ide-assists/src/handlers/extract_function.rs
+++ b/crates/ide-assists/src/handlers/extract_function.rs

@@ -810,7 +810,7 @@ impl FunctionBody {

(true, konst.body(), Some(sema.to_def(&konst)?.ty(sema.db)))

ast::ConstParam(cp) => {

- (true, cp.default_val(), Some(sema.to_def(&cp)?.ty(sema.db)))

+ (true, cp.default_val()?.expr(), Some(sema.to_def(&cp)?.ty(sema.db)))

ast::ConstBlockPat(cbp) => {

let expr = cbp.block_expr().map(ast::Expr::BlockExpr);

diff --git a/crates/ide-db/src/path_transform.rs b/crates/ide-db/src/path_transform.rs
index cb04a0381b..507200ea3b 100644
--- a/crates/ide-db/src/path_transform.rs
+++ b/crates/ide-db/src/path_transform.rs

@@ -160,9 +160,10 @@ impl<'a> PathTransform<'a> {

}

(Either::Left(k), None) => {

if let Some(default) = k.default(db) {

- let default = ast::make::expr_const_value(&default);

- const_substs.insert(k, default.syntax().clone_for_update());

- // FIXME: transform the default value

+ if let Some(default) = ast::make::expr_const_value(&default).expr() {

+ const_substs.insert(k, default.syntax().clone_for_update());

+ // FIXME: transform the default value

+ }

}

_ => (), // ignore mismatching params

diff --git a/crates/parser/src/grammar/generic_params.rs b/crates/parser/src/grammar/generic_params.rs
index 8ed1c84c4c..29d9b05d3f 100644
--- a/crates/parser/src/grammar/generic_params.rs
+++ b/crates/parser/src/grammar/generic_params.rs

@@ -88,7 +88,7 @@ fn const_param(p: &mut Parser<'_>, m: Marker) {

// test const_param_default_path

// struct A<const N: i32 = i32::MAX>;

- generic_args::const_arg_expr(p);

+ generic_args::const_arg(p);

}

m.complete(p, CONST_PARAM);

diff --git a/crates/parser/test_data/parser/inline/err/0022_recover_from_missing_const_default.rast b/crates/parser/test_data/parser/inline/err/0022_recover_from_missing_const_default.rast
index 809ad1b8d5..49f163b164 100644
--- a/crates/parser/test_data/parser/inline/err/0022_recover_from_missing_const_default.rast
+++ b/crates/parser/test_data/parser/inline/err/0022_recover_from_missing_const_default.rast

@@ -20,7 +20,8 @@ SOURCE_FILE

IDENT "i32"

WHITESPACE " "

EQ "="

- WHITESPACE " "

+ WHITESPACE " "

+ CONST_ARG

COMMA ","

WHITESPACE " "

CONST_PARAM

@@ -37,8 +38,9 @@ SOURCE_FILE

IDENT "i32"

WHITESPACE " "

EQ "="

+ CONST_ARG

R_ANGLE ">"

SEMICOLON ";"

WHITESPACE "\n"

-error 23: expected a generic const argument

+error 24: expected a generic const argument

error 40: expected a generic const argument

diff --git a/crates/parser/test_data/parser/inline/ok/0188_const_param_default_path.rast b/crates/parser/test_data/parser/inline/ok/0188_const_param_default_path.rast
index 11002bf98d..3f5fb47d28 100644
--- a/crates/parser/test_data/parser/inline/ok/0188_const_param_default_path.rast
+++ b/crates/parser/test_data/parser/inline/ok/0188_const_param_default_path.rast

@@ -21,16 +21,17 @@ SOURCE_FILE

WHITESPACE " "

EQ "="

WHITESPACE " "

- PATH_EXPR

- PATH

+ CONST_ARG

+ PATH_EXPR

PATH

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "i32"

+ COLON2 "::"

PATH_SEGMENT

NAME_REF

- IDENT "i32"

- COLON2 "::"

- PATH_SEGMENT

- NAME_REF

- IDENT "MAX"

+ IDENT "MAX"

R_ANGLE ">"

SEMICOLON ";"

WHITESPACE "\n"

diff --git a/crates/parser/test_data/parser/inline/ok/0199_const_param_default_expression.rast b/crates/parser/test_data/parser/inline/ok/0199_const_param_default_expression.rast
index 0607ff54fb..d650113749 100644
--- a/crates/parser/test_data/parser/inline/ok/0199_const_param_default_expression.rast
+++ b/crates/parser/test_data/parser/inline/ok/0199_const_param_default_expression.rast

@@ -21,14 +21,15 @@ SOURCE_FILE

WHITESPACE " "

EQ "="

WHITESPACE " "

- BLOCK_EXPR

- STMT_LIST

- L_CURLY "{"

- WHITESPACE " "

- LITERAL

- INT_NUMBER "1"

- WHITESPACE " "

- R_CURLY "}"

+ CONST_ARG

+ BLOCK_EXPR

+ STMT_LIST

+ L_CURLY "{"

+ WHITESPACE " "

+ LITERAL

+ INT_NUMBER "1"

+ WHITESPACE " "

+ R_CURLY "}"

R_ANGLE ">"

SEMICOLON ";"

WHITESPACE "\n"

diff --git a/crates/parser/test_data/parser/inline/ok/0200_const_param_default_literal.rast b/crates/parser/test_data/parser/inline/ok/0200_const_param_default_literal.rast
index 8e52313651..6de10353bf 100644
--- a/crates/parser/test_data/parser/inline/ok/0200_const_param_default_literal.rast
+++ b/crates/parser/test_data/parser/inline/ok/0200_const_param_default_literal.rast

@@ -21,10 +21,11 @@ SOURCE_FILE

WHITESPACE " "

EQ "="

WHITESPACE " "

- PREFIX_EXPR

- MINUS "-"

- LITERAL

- INT_NUMBER "1"

+ CONST_ARG

+ PREFIX_EXPR

+ MINUS "-"

+ LITERAL

+ INT_NUMBER "1"

R_ANGLE ">"

SEMICOLON ";"

WHITESPACE "\n"

diff --git a/crates/syntax/rust.ungram b/crates/syntax/rust.ungram
index 138ddd2089..ea7ebd85b3 100644
--- a/crates/syntax/rust.ungram
+++ b/crates/syntax/rust.ungram

@@ -296,7 +296,7 @@ TypeParam =

ConstParam =

Attr* 'const' Name ':' Type

- ('=' default_val:Expr)?

+ ('=' default_val:ConstArg)?

LifetimeParam =

Attr* Lifetime (':' TypeBoundList?)?

diff --git a/crates/syntax/src/ast/generated/nodes.rs b/crates/syntax/src/ast/generated/nodes.rs
index 0b27faa535..16448db04f 100644
--- a/crates/syntax/src/ast/generated/nodes.rs
+++ b/crates/syntax/src/ast/generated/nodes.rs

@@ -709,7 +709,7 @@ impl ConstParam {

pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }

pub fn ty(&self) -> Option<Type> { support::child(&self.syntax) }

pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }

- pub fn default_val(&self) -> Option<Expr> { support::child(&self.syntax) }

+ pub fn default_val(&self) -> Option<ConstArg> { support::child(&self.syntax) }

}

#[derive(Debug, Clone, PartialEq, Eq, Hash)]

diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index 1eefd94905..217134385a 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs

@@ -509,7 +509,7 @@ pub fn expr_literal(text: &str) -> ast::Literal {

ast_from_text(&format!("fn f() {{ let _ = {text}; }}"))

}

-pub fn expr_const_value(text: &str) -> ast::Expr {

+pub fn expr_const_value(text: &str) -> ast::ConstArg {

ast_from_text(&format!("trait Foo<const N: usize = {text}> {{}}"))

}