bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #88418 - fee1-dead:trait-assoc-tilde-const, r=oli-obk

Browse source 
Allow `~const` bounds on trait assoc functions

r? `@oli-obk`
This commit is contained in:
Mara Bos 2021-08-31 17:54:56 +02:00 • committed by GitHub
commit ab37e49611
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 180 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_ast_passes/src/ast_validation.rs
View file

@ -1442,7 +1442,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
if !self.is_tilde_const_allowed {
self.err_handler()
.struct_span_err(bound.span(), "`~const` is not allowed here")
.note("only allowed on bounds on traits' associated types, const fns, const impls and its associated functions")
.note("only allowed on bounds on traits' associated types and functions, const fns, const impls and its associated functions")
.emit();
}
}
@ -1616,7 +1616,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
walk_list!(self, visit_ty, ty);
}
AssocItemKind::Fn(box FnKind(_, ref sig, ref generics, ref body))
if self.in_const_trait_impl =>
if self.in_const_trait_impl || ctxt == AssocCtxt::Trait =>
{
self.visit_vis(&item.vis);
self.visit_ident(item.ident);