Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix small typo #543

Merged
merged 4 commits into from
Sep 1, 2023
Merged

Fix small typo #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db57357
Fix small typo
fwessels Aug 30, 2023
d0c8f0a
Merge branch 'modularml:main' into main
fwessels Sep 1, 2023
f105bcc
Update lifetimes-and-provenance.md
fwessels Sep 1, 2023
0298acd
Update lifetimes-and-provenance.md
fwessels Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/notebooks/programming-manual.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,7 @@
"alias Float16 = SIMD[DType.float16, 1]\n",
"alias UInt8 = SIMD[DType.uint8, 1]\n",
"\n",
"var x : Float16 # F16 works like a \"typedef\""
"var x : Float16 # Float16 works like a \"typedef\""
]
},
{
Expand Down Expand Up @@ -3514,4 +3514,4 @@
},
"nbformat" : 4,
"nbformat_minor" : 2
}
}
6 changes: 3 additions & 3 deletions proposals/lifetimes-and-provenance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ in the context of `a`.

Because of this, the lifetimes in a function signature are something of a
"transfer function" that expresses mappings from input lifetimes to returned
lifetimes, and that allow reasoning about the lifetimes of field references.
lifetimes, and that allows reasoning about the lifetimes of field references.
Mojo already has a powerful parameter system that allows it to express these
sorts of relationships, so this all plugs together.

Expand Down Expand Up @@ -108,12 +108,12 @@ This change invalidates a basic syntax decision we made earlier: we need to move

```
// Mojo today
fn example(inout a: Int, borrowed b: F32): …
fn example(inout a: Int, borrowed b: Float32): …
struct S:
fn method(inout self): …

// Mojo with lifetimes
fn example(a: inout Int, b: borrowed F32): …
fn example(a: inout Int, b: borrowed Float32): …
struct S:
fn method(self: inout): …
```
Expand Down