From 954f68766621df016c0cf5d220be579c350fe19c Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Fri, 11 Aug 2023 16:14:33 +0200 Subject: [PATCH] minor fixes --- crates/compiler/parse/src/expr.rs | 2 +- crates/compiler/parse/src/parser.rs | 2 +- crates/compiler/parse/src/type_annotation.rs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/compiler/parse/src/expr.rs b/crates/compiler/parse/src/expr.rs index 31bbc89290..ed216452e3 100644 --- a/crates/compiler/parse/src/expr.rs +++ b/crates/compiler/parse/src/expr.rs @@ -1286,7 +1286,7 @@ mod ability { Exact(u32), } - /// Parses an ability demand like `hash : a -> U64 | a implements Hash`, in the context of a larger + /// Parses an ability demand like `hash : a -> U64 where a implements Hash`, in the context of a larger /// ability definition. /// This is basically the same as parsing a free-floating annotation, but with stricter rules. pub fn parse_demand<'a>( diff --git a/crates/compiler/parse/src/parser.rs b/crates/compiler/parse/src/parser.rs index 2604888417..1caef42867 100644 --- a/crates/compiler/parse/src/parser.rs +++ b/crates/compiler/parse/src/parser.rs @@ -599,7 +599,7 @@ pub enum EType<'a> { TEnd(Position), TFunctionArgument(Position), TWhereBar(Position), - THasClause(Position), + TImplementsClause(Position), TAbilityImpl(ETypeAbilityImpl<'a>, Position), /// TIndentStart(Position), diff --git a/crates/compiler/parse/src/type_annotation.rs b/crates/compiler/parse/src/type_annotation.rs index 6f33073a66..7f5d85205b 100644 --- a/crates/compiler/parse/src/type_annotation.rs +++ b/crates/compiler/parse/src/type_annotation.rs @@ -426,7 +426,7 @@ fn ability_chain<'a>() -> impl Parser<'a, Vec<'a, Loc>>, ETyp EType::TIndentEnd, ), zero_or_more!(skip_first!( - word1(b'&', EType::THasClause), + word1(b'&', EType::TImplementsClause), space0_before_optional_after( specialize(EType::TApply, loc!(concrete_type())), EType::TIndentStart, @@ -459,7 +459,7 @@ fn implements_clause<'a>() -> impl Parser<'a, Loc>, EType<' ), skip_first!( // Parse "implements"; we don't care about this keyword - word(crate::keyword::IMPLEMENTS, EType::THasClause), + word(crate::keyword::IMPLEMENTS, EType::TImplementsClause), // Parse "Hash & ..."; this may be qualified from another module like "Hash.Hash" absolute_column_min_indent(ability_chain()) ) @@ -494,7 +494,7 @@ fn implements_clause_chain<'a>( let (_, first_clause, state) = implements_clause().parse(arena, state, min_indent)?; let (_, mut clauses, state) = zero_or_more!(skip_first!( - word1(b',', EType::THasClause), + word1(b',', EType::TImplementsClause), implements_clause() )) .parse(arena, state, min_indent)?; @@ -514,7 +514,7 @@ fn implements_clause_chain<'a>( pub fn implements_abilities<'a>() -> impl Parser<'a, Loc>, EType<'a>> { increment_min_indent(skip_first!( // Parse "implements"; we don't care about this keyword - word(crate::keyword::IMPLEMENTS, EType::THasClause), + word(crate::keyword::IMPLEMENTS, EType::TImplementsClause), // Parse "Hash"; this may be qualified from another module like "Hash.Hash" space0_before_e( loc!(map!(