From 46cb45f71736a5ba699fd641976474035d077797 Mon Sep 17 00:00:00 2001 From: Bryce Miller Date: Sat, 20 May 2023 19:24:08 -0400 Subject: [PATCH] loc_has -> loc_implements --- crates/compiler/can/src/def.rs | 2 +- crates/compiler/fmt/src/def.rs | 2 +- crates/compiler/fmt/src/spaces.rs | 4 ++-- crates/compiler/parse/src/ast.rs | 4 ++-- crates/compiler/parse/src/expr.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/compiler/can/src/def.rs b/crates/compiler/can/src/def.rs index 140da5955e..e4dee03468 100644 --- a/crates/compiler/can/src/def.rs +++ b/crates/compiler/can/src/def.rs @@ -2611,7 +2611,7 @@ fn to_pending_type_def<'a>( Ability { header: TypeHeader { name, vars }, members, - loc_has: _, + loc_implements: _, } => { let name = match scope .introduce_without_shadow_symbol(&Ident::from(name.value), name.region) diff --git a/crates/compiler/fmt/src/def.rs b/crates/compiler/fmt/src/def.rs index bb5268bcc2..b2066f5ffe 100644 --- a/crates/compiler/fmt/src/def.rs +++ b/crates/compiler/fmt/src/def.rs @@ -123,7 +123,7 @@ impl<'a> Formattable for TypeDef<'a> { } Ability { header: TypeHeader { name, vars }, - loc_has: _, + loc_implements: _, members, } => { buf.indent(indent); diff --git a/crates/compiler/fmt/src/spaces.rs b/crates/compiler/fmt/src/spaces.rs index 450963fe9d..98ae35ca10 100644 --- a/crates/compiler/fmt/src/spaces.rs +++ b/crates/compiler/fmt/src/spaces.rs @@ -507,14 +507,14 @@ impl<'a> RemoveSpaces<'a> for TypeDef<'a> { }, Ability { header: TypeHeader { name, vars }, - loc_has, + loc_implements: loc_has, members, } => Ability { header: TypeHeader { name: name.remove_spaces(arena), vars: vars.remove_spaces(arena), }, - loc_has: loc_has.remove_spaces(arena), + loc_implements: loc_has.remove_spaces(arena), members: members.remove_spaces(arena), }, } diff --git a/crates/compiler/parse/src/ast.rs b/crates/compiler/parse/src/ast.rs index 855441d39c..88e6db4210 100644 --- a/crates/compiler/parse/src/ast.rs +++ b/crates/compiler/parse/src/ast.rs @@ -402,7 +402,7 @@ pub enum TypeDef<'a> { /// hash : a -> U64 | a implements Hash Ability { header: TypeHeader<'a>, - loc_has: Loc>, + loc_implements: Loc>, members: &'a [AbilityMember<'a>], }, } @@ -1681,7 +1681,7 @@ impl<'a> Malformed for TypeDef<'a> { } => header.is_malformed() || typ.is_malformed() || derived.is_malformed(), TypeDef::Ability { header, - loc_has, + loc_implements: loc_has, members, } => { header.is_malformed() diff --git a/crates/compiler/parse/src/expr.rs b/crates/compiler/parse/src/expr.rs index 5cfc998311..7e5cf1a527 100644 --- a/crates/compiler/parse/src/expr.rs +++ b/crates/compiler/parse/src/expr.rs @@ -1408,7 +1408,7 @@ fn finish_parsing_ability_def_help<'a>( let def_region = Region::span_across(&name.region, &demands.last().unwrap().typ.region); let type_def = TypeDef::Ability { header: TypeHeader { name, vars: args }, - loc_has, + loc_implements: loc_has, members: demands.into_bump_slice(), };