Skip to content

Commit 2c73099

Browse files
committed
---
yaml --- r: 231798 b: refs/heads/auto c: 6ca5d52 h: refs/heads/master v: v3
1 parent 87605b1 commit 2c73099

File tree

30 files changed

+327
-1647
lines changed

30 files changed

+327
-1647
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 5c2cfdfb79d3be18ee50f5b5a60205d040c8396a
11+
refs/heads/auto: 6ca5d52bd2888b0871c9e94da2cd3d5cba796a3a
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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, increment: f64) -> Circle {
123+
fn grow(&self) -> 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 `Circle`s, but we will
164+
Let’s say that we want our users to be able to create Circles, 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/auto/src/etc/platform-intrinsics/aarch64.json

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -336,48 +336,6 @@
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-
},
381339
{
382340
"intrinsic": "padd{0.width}_{0.data_type}",
383341
"width": [64, 128],

0 commit comments

Comments
 (0)