Skip to content

Commit c00e252

Browse files
committed
---
yaml --- r: 208255 b: refs/heads/snap-stage3 c: 5613502 h: refs/heads/master i: 208253: 91bfcc7 208251: 5599bc8 208247: 1b9183c 208239: 2f7ee93 208223: fbb8a3d 208191: 37ee328 208127: 397d6c4 v: v3
1 parent 51438fc commit c00e252

File tree

9 files changed

+21
-66
lines changed

9 files changed

+21
-66
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: d065d5769055b73d65fece8bc7221e82d03dce74
4+
refs/heads/snap-stage3: 5613502a4f3476e5db2c68bdf203104556796630
55
refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/doc/trpl/ownership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ fn foo(v: Vec<i32>) -> Vec<i32> {
174174
}
175175
```
176176

177-
This would get very tedious. It gets worse the more things we want to take ownership of:
177+
This would get very tedius. It gets worse the more things we want to take ownership of:
178178

179179
```rust
180180
fn foo(v1: Vec<i32>, v2: Vec<i32>) -> (Vec<i32>, Vec<i32>, i32) {

branches/snap-stage3/src/doc/trpl/primitive-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Slices have type `&[T]`. We’ll talk about that `T` when we cover
176176

177177
[generics]: generics.html
178178

179-
You can find more documentation for slices [in the standard library
179+
You can find more documentation for `slices`s [in the standard library
180180
documentation][slice].
181181

182182
[slice]: ../std/primitive.slice.html

branches/snap-stage3/src/doc/trpl/references-and-borrowing.md

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ println!("{}", y);
312312

313313
We get this error:
314314

315-
```text
316315
error: `x` does not live long enough
317316
y = &x;
318317
^
@@ -335,37 +334,3 @@ In other words, `y` is only valid for the scope where `x` exists. As soon as
335334
`x` goes away, it becomes invalid to refer to it. As such, the error says that
336335
the borrow ‘doesn’t live long enough’ because it’s not valid for the right
337336
amount of time.
338-
339-
The same problem occurs when the reference is declared _before_ the variable it refers to:
340-
341-
```rust,ignore
342-
let y: &i32;
343-
let x = 5;
344-
y = &x;
345-
346-
println!("{}", y);
347-
```
348-
349-
We get this error:
350-
351-
```text
352-
error: `x` does not live long enough
353-
y = &x;
354-
^
355-
note: reference must be valid for the block suffix following statement 0 at
356-
2:16...
357-
let y: &i32;
358-
let x = 5;
359-
y = &x;
360-
361-
println!("{}", y);
362-
}
363-
364-
note: ...but borrowed value is only valid for the block suffix following
365-
statement 1 at 3:14
366-
let x = 5;
367-
y = &x;
368-
369-
println!("{}", y);
370-
}
371-
```
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
# Configs
22

3-
These are some links to repos with configs which ease the use of rust.
4-
5-
## Officially Maintained Configs
3+
Here are some links to repos with configs which ease the use of rust:
64

75
* [rust.vim](https://github.com/rust-lang/rust.vim)
86
* [emacs rust-mode](https://github.com/rust-lang/rust-mode)
97
* [gedit-config](https://github.com/rust-lang/gedit-config)
108
* [kate-config](https://github.com/rust-lang/kate-config)
119
* [nano-config](https://github.com/rust-lang/nano-config)
1210
* [zsh-config](https://github.com/rust-lang/zsh-config)
13-
14-
## Community-maintained Configs
15-
16-
* [.editorconfig](https://gist.github.com/derhuerst/c9d1b9309e308d9851fa) ([what is this?](http://editorconfig.org/))

branches/snap-stage3/src/libcollections/string.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,6 @@ impl<T: fmt::Display + ?Sized> ToString for T {
10521052

10531053
#[stable(feature = "rust1", since = "1.0.0")]
10541054
impl AsRef<str> for String {
1055-
#[inline]
10561055
fn as_ref(&self) -> &str {
10571056
self
10581057
}

branches/snap-stage3/src/libcore/convert.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ impl<T> AsMut<[T]> for [T] {
173173

174174
#[stable(feature = "rust1", since = "1.0.0")]
175175
impl AsRef<str> for str {
176-
#[inline]
177176
fn as_ref(&self) -> &str {
178177
self
179178
}

branches/snap-stage3/src/librustc_typeck/diagnostics.rs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,23 @@ enum variant, one of the fields was not provided. Each field should be specified
4646
exactly once.
4747
"##,
4848

49+
E0067: r##"
50+
The left-hand side of an assignment operator must be an lvalue expression. An
51+
lvalue expression represents a memory location and includes item paths (ie,
52+
namespaced variables), dereferences, indexing expressions, and field references.
53+
54+
```
55+
use std::collections::LinkedList;
56+
57+
// Good
58+
let mut list = LinkedList::new();
59+
60+
61+
// Bad: assignment to non-lvalue expression
62+
LinkedList::new() += 1;
63+
```
64+
"##,
65+
4966
E0081: r##"
5067
Enum discriminants are used to differentiate enum variants stored in memory.
5168
This error indicates that the same value was used for two or more variants,
@@ -149,7 +166,6 @@ register_diagnostics! {
149166
E0060,
150167
E0061,
151168
E0066,
152-
E0067,
153169
E0068,
154170
E0069,
155171
E0070,

branches/snap-stage3/src/libstd/collections/hash/map.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -916,24 +916,6 @@ impl<K, V, S> HashMap<K, V, S>
916916
}
917917

918918
/// Gets the given key's corresponding entry in the map for in-place manipulation.
919-
///
920-
/// # Examples
921-
///
922-
/// ```
923-
/// use std::collections::HashMap;
924-
///
925-
/// let mut letters = HashMap::new();
926-
///
927-
/// for ch in "a short treatise on fungi".chars() {
928-
/// let counter = letters.entry(ch).or_insert(0);
929-
/// *counter += 1;
930-
/// }
931-
///
932-
/// assert_eq!(letters[&'s'], 2);
933-
/// assert_eq!(letters[&'t'], 3);
934-
/// assert_eq!(letters[&'u'], 1);
935-
/// assert_eq!(letters.get(&'y'), None);
936-
/// ```
937919
#[stable(feature = "rust1", since = "1.0.0")]
938920
pub fn entry(&mut self, key: K) -> Entry<K, V> {
939921
// Gotta resize now.

0 commit comments

Comments
 (0)