Skip to content

Commit 27e46e2

Browse files
committed
---
yaml --- r: 234035 b: refs/heads/beta c: 205c356 h: refs/heads/master i: 234033: a16a5c0 234031: fe5898c v: v3
1 parent 906867b commit 27e46e2

File tree

29 files changed

+1645
-325
lines changed

29 files changed

+1645
-325
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 6ca5d52bd2888b0871c9e94da2cd3d5cba796a3a
26+
refs/heads/beta: 205c356ace559f511d5b7e51fd6b8c46bb4cc1ea
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/doc/trpl/method-syntax.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ can be awkward. Consider this code:
77
baz(bar(foo));
88
```
99

10-
We would read this left-to right, and so we see ‘baz bar foo’. But this isn’t the
10+
We would read this left-to-right, and so we see ‘baz bar foo’. But this isn’t the
1111
order that the functions would get called in, that’s inside-out: ‘foo bar baz’.
1212
Wouldn’t it be nice if we could do this instead?
1313

@@ -45,17 +45,17 @@ This will print `12.566371`.
4545

4646

4747

48-
We’ve made a struct that represents a circle. We then write an `impl` block,
48+
We’ve made a `struct` that represents a circle. We then write an `impl` block,
4949
and inside it, define a method, `area`.
5050

51-
Methods take a special first parameter, of which there are three variants:
51+
Methods take a special first parameter, of which there are three variants:
5252
`self`, `&self`, and `&mut self`. You can think of this first parameter as
5353
being the `foo` in `foo.bar()`. The three variants correspond to the three
5454
kinds of things `foo` could be: `self` if it’s just a value on the stack,
5555
`&self` if it’s a reference, and `&mut self` if it’s a mutable reference.
5656
Because we took the `&self` parameter to `area`, we can use it just like any
5757
other parameter. Because we know it’s a `Circle`, we can access the `radius`
58-
just like we would with any other struct.
58+
just like we would with any other `struct`.
5959

6060
We should default to using `&self`, as you should prefer borrowing over taking
6161
ownership, as well as taking immutable references over mutable ones. Here’s an
@@ -120,12 +120,12 @@ Check the return type:
120120
```rust
121121
# struct Circle;
122122
# impl Circle {
123-
fn grow(&self) -> Circle {
123+
fn grow(&self, increment: f64) -> Circle {
124124
# Circle } }
125125
```
126126

127127
We just say we’re returning a `Circle`. With this method, we can grow a new
128-
circle to any arbitrary size.
128+
`Circle` to any arbitrary size.
129129

130130
# Associated functions
131131

@@ -161,7 +161,7 @@ methods’.
161161

162162
# Builder Pattern
163163

164-
Let’s say that we want our users to be able to create Circles, but we will
164+
Let’s say that we want our users to be able to create `Circle`s, but we will
165165
allow them to only set the properties they care about. Otherwise, the `x`
166166
and `y` attributes will be `0.0`, and the `radius` will be `1.0`. Rust doesn’t
167167
have method overloading, named arguments, or variable arguments. We employ
@@ -224,7 +224,7 @@ fn main() {
224224
}
225225
```
226226

227-
What we’ve done here is make another struct, `CircleBuilder`. We’ve defined our
227+
What we’ve done here is make another `struct`, `CircleBuilder`. We’ve defined our
228228
builder methods on it. We’ve also defined our `area()` method on `Circle`. We
229229
also made one more method on `CircleBuilder`: `finalize()`. This method creates
230230
our final `Circle` from the builder. Now, we’ve used the type system to enforce

branches/beta/src/etc/platform-intrinsics/aarch64.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,48 @@
336336
"ret": "i8",
337337
"args": ["0"]
338338
},
339+
{
340+
"intrinsic": "ld2{0[0].width}_{0[0].data_type}",
341+
"width": [64, 128],
342+
"llvm": "ld2.{0[0].llvm_name}.{1.llvm_name}",
343+
"ret": ["[i(8-64);2]","[f(32-64);2]"],
344+
"args": ["0.0SPc/0.0"]
345+
},
346+
{
347+
"intrinsic": "ld3{0[0].width}_{0[0].data_type}",
348+
"width": [64, 128],
349+
"llvm": "ld3.{0[0].llvm_name}.{1.llvm_name}",
350+
"ret": ["[i(8-64);3]","[f(32-64);3]"],
351+
"args": ["0.0SPc/0.0"]
352+
},
353+
{
354+
"intrinsic": "ld4{0[0].width}_{0[0].data_type}",
355+
"width": [64, 128],
356+
"llvm": "ld4.{0[0].llvm_name}.{1.llvm_name}",
357+
"ret": ["[i(8-64);4]","[f(32-64);4]"],
358+
"args": ["0.0SPc/0.0"]
359+
},
360+
{
361+
"intrinsic": "ld2{0[0].width}_dup_{0[0].data_type}",
362+
"width": [64, 128],
363+
"llvm": "ld2.{0[0].llvm_name}.{1.llvm_name}",
364+
"ret": ["[i(8-64);2]","[f(32-64);2]"],
365+
"args": ["0.0SPc"]
366+
},
367+
{
368+
"intrinsic": "ld3{0[0].width}_dup_{0[0].data_type}",
369+
"width": [64, 128],
370+
"llvm": "ld3.{0[0].llvm_name}.{1.llvm_name}",
371+
"ret": ["[i(8-64);3]","[f(32-64);3]"],
372+
"args": ["0.0SPc"]
373+
},
374+
{
375+
"intrinsic": "ld4{0[0].width}_dup_{0[0].data_type}",
376+
"width": [64, 128],
377+
"llvm": "ld4.{0[0].llvm_name}.{1.llvm_name}",
378+
"ret": ["[i(8-64);4]","[f(32-64);4]"],
379+
"args": ["0.0SPc"]
380+
},
339381
{
340382
"intrinsic": "padd{0.width}_{0.data_type}",
341383
"width": [64, 128],

0 commit comments

Comments
 (0)