From 674f2257dbad445c2f1a190f9deaeb4ece4f816e Mon Sep 17 00:00:00 2001 From: Krishna Agarwal Date: Fri, 5 Aug 2022 21:03:24 +0530 Subject: [PATCH] grammar mistakes (#1915) Grammar Mistakes --- docs/design/generics/goals.md | 2 +- docs/design/generics/terminology.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/design/generics/goals.md b/docs/design/generics/goals.md index b69ae78d2fe0..6aab5982d1f2 100644 --- a/docs/design/generics/goals.md +++ b/docs/design/generics/goals.md @@ -161,7 +161,7 @@ in cases that inheritance struggles with. ### Use cases -To clarify the expressive range we are aming for, here are some specific use +To clarify the expressive range we are aiming for, here are some specific use cases we expect Carbon generics to cover. #### Generic programming diff --git a/docs/design/generics/terminology.md b/docs/design/generics/terminology.md index 17c9cb5800ca..2ce2691d5421 100644 --- a/docs/design/generics/terminology.md +++ b/docs/design/generics/terminology.md @@ -69,7 +69,7 @@ a single one. ## Generic versus template parameters -When we are distinguishing between generics and templates in Carbon, it is on an +When we are distinguishing between generics and templates in Carbon, it is on a parameter by parameter basis. A single function can take a mix of regular, generic, and template parameters. @@ -195,7 +195,7 @@ fn F[template T:! Type](x: T*) -> T; fn F(x: Int) -> bool; ``` -A generic function `G` can call `F` with a type like `T*` that can not possibly +A generic function `G` can call `F` with a type like `T*` that cannot possibly call the `F(Int)` overload for `F`, and so it can consistently determine the return type of `F`. But `G` can't call `F` with an argument that could match either overload. @@ -267,7 +267,7 @@ complete definition checking. This occurs for ## Deduced parameter -An deduced parameter is listed in the optional `[` `]` section right after the +A deduced parameter is listed in the optional `[` `]` section right after the function name in a function signature: `fn` <name> `[` <deduced parameters> `](` <explicit parameters `) ->`