Skip to content

Commit 6a254f5

Browse files
committed
---
yaml --- r: 149503 b: refs/heads/try2 c: b48833d h: refs/heads/master i: 149501: 9f6caa1 149499: c112ce8 149495: ec3f84a 149487: 7a41623 149471: e3b2d20 149439: 1d6ac5d 149375: 2679e90 149247: 20e2686 148991: a70e21b 148479: 071798e 147455: 5fb3c26 v: v3
1 parent ff37540 commit 6a254f5

File tree

28 files changed

+486
-537
lines changed

28 files changed

+486
-537
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 76b262f693381b404934dc893b98baf6dbc4aa8f
8+
refs/heads/try2: b48833d6db16c7d94f20ee6083dbb880979acfd4
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/doc/complement-cheatsheet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Description C signature Equivalent
211211
---------------------- ---------------------------------------------- ------------------------------------------
212212
no parameters `void foo(void);` `fn foo();`
213213
return value `int foo(void);` `fn foo() -> c_int;`
214-
function parameters `void foo(int x, int y);` `fn foo(x: c_int, y: c_int);`
214+
function parameters `void foo(int x, int y);` `fn foo(x: int, y: int);`
215215
in-out pointers `void foo(const int* in_ptr, int* out_ptr);` `fn foo(in_ptr: *c_int, out_ptr: *mut c_int);`
216216
217217
Note: The Rust signatures should be wrapped in an `extern "ABI" { ... }` block.

branches/try2/src/doc/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ type was invalid because the size was infinite!
10261026

10271027
An *owned box* (`~`) uses a dynamic memory allocation to provide the invariant
10281028
of always being the size of a pointer, regardless of the contained type. This
1029-
can be leveraged to create a valid `List` definition:
1029+
can be leverage to create a valid `List` definition:
10301030

10311031
~~~
10321032
enum List {

0 commit comments

Comments
 (0)