Manish Goregaokar
3610c731f3
Rollup merge of #28225 - jackwilsonv:patch-3, r=steveklabnik
...
r? @steveklabnik
2015-09-05 16:16:01 +05:30
Jack Wilson
f44fbf08f9
Capitalize circle reference
2015-09-03 20:51:08 -07:00
Jack Wilson
2548e2ee58
Fixes minor formatting inconsistencies
2015-09-03 20:48:26 -07:00
Steve Klabnik
6c9549dd20
Rollup merge of #28216 - christopherdumas:fix_28196, r=steveklabnik
...
This is a docs change suggested in #28196 .
r? @steveklabnik
2015-09-03 20:10:10 -04:00
Steve Klabnik
79ea0eed5b
Rollup merge of #28215 - matklad:grammar-extern-block-item, r=steveklabnik
...
extern_block should be extern_block_item.
extern_block_item is `extern { bunch of fns }`, extern_block is just `bunch of fns`
r? @steveklabnik
2015-09-03 20:10:09 -04:00
Steve Klabnik
fd10ded4ea
Rollup merge of #28214 - tshepang:word-not-name, r=steveklabnik
...
Also, add missing comma
2015-09-03 20:10:09 -04:00
Steve Klabnik
ce20719717
Rollup merge of #28213 - tshepang:replace-comma, r=steveklabnik
2015-09-03 20:10:09 -04:00
Steve Klabnik
5b8241cea9
Rollup merge of #28212 - tshepang:rust-is-a-language, r=steveklabnik
2015-09-03 20:10:09 -04:00
Steve Klabnik
e903d9c9b9
Rollup merge of #28210 - tshepang:typo, r=steveklabnik
2015-09-03 20:10:08 -04:00
Steve Klabnik
ff7f5cd0c6
Rollup merge of #28208 - matklad:grammar-whitespace-cleanup, r=steveklabnik
2015-09-03 20:10:08 -04:00
Steve Klabnik
a10e87648f
Rollup merge of #28207 - tshepang:flow, r=steveklabnik
2015-09-03 20:10:08 -04:00
Steve Klabnik
54279e0ced
Rollup merge of #28205 - matklad:grammar-remove-proc, r=alexcrichton
...
As I understand, there are no proc closures in Rust any more. So this pr removes `procedure_type` production. It isn't used anywhere. The `proc` is still a keyword.
r? @steveklabnik
@bors: r+ rollup
2015-09-03 20:10:07 -04:00
Steve Klabnik
35019737cc
Rollup merge of #28204 - matklad:grammar-duplicate-else-tail, r=steveklabnik
...
The rule `else_tail` was duplicated in `if` and `if_let` sections. I guess that this is a mistake.
r? @steveklabnik
2015-09-03 20:10:07 -04:00
Steve Klabnik
723ebc2471
Rollup merge of #28203 - benschulz:book-deref-coercion, r=brson
...
I have two issues with the section "Deref and method calls" of the book's chapter "Deref coercions".
- (Minor) It says "In other words, these are the same two things in Rust:", followed by a code block in which no two things seem similar, much less the same. Presumably this sentence made more sense in a previous revision.
- The next paragraph conflates two concepts which, imho, should kept separate. They are
- deref coercion, i.e. inserting as many `*` as necessary and
- implicitly referencing the receiver, i.e. inserting a single `&` to satisfy the method's `self` parameter type.
I appreciate that with the proposed changes the example becomes very contrived, even for a foo-bar-baz one. However, the current exmplanation is just wrong.
2015-09-03 20:10:07 -04:00
Steve Klabnik
b96618e18b
Rollup merge of #28202 - matklad:grammar-loop-labels, r=steveklabnik
...
This adds missing `?` marks to productions for loops and break/continue.
It also adds missing option label to while let loop.
Note that '[' foo ']' means grouping in BNF, and '?' is used for possible missing items.
r? @steveklabnik
2015-09-03 20:10:07 -04:00
christopherdumas
17fde3a34d
Removed incorrect reference from #28196
2015-09-03 14:39:34 -07:00
Aleksey Kladov
73a6199248
reference grammar: fix item definition
...
extern_block should extern_block_item
2015-09-04 00:29:47 +03:00
Aleksey Kladov
f7d5c25b3d
reference grammar: whitespace cleanup
2015-09-03 23:42:33 +03:00
Tshepang Lekhonkhobe
6cdba4f766
book: it is RwLock, not RWLock
2015-09-03 22:14:28 +02:00
Manish Goregaokar
67616f7191
Rollup merge of #28186 - thomas07vt:thomas07vt-patch-trpl-rust-inside-other-languages.md, r=steveklabnik
...
The embed rust file that we compile prints out 'Thread finished..' messages along with a 'done!' r? @steveklabnik
2015-09-04 01:40:02 +05:30
Manish Goregaokar
0c2924386d
Rollup merge of #28184 - xiaochuanyu:patch-1, r=alexcrichton
...
Originally in an example it reads as follows:
```rust
fn inverse<T>() -> T
// this is using ConvertTo as if it were "ConvertFrom<i32>"
where i32: ConvertTo<T> {
42.convert()
}
```
There was no mention of `ConvertFrom` elsewhere in the page other than in this comment. Is this supposed to be `ConvertTo<i64>` ?
I'm confused by this example.
2015-09-04 01:40:01 +05:30
Tshepang Lekhonkhobe
23956ae1f4
book: improve flow
2015-09-03 21:54:00 +02:00
Tshepang Lekhonkhobe
197cec6ed9
book: Rust is a language, so no need to mention that fact here
2015-09-03 21:40:19 +02:00
Aleksey Kladov
59f2343bdb
reference grammar: remove procedure_type
2015-09-03 22:25:47 +03:00
Aleksey Kladov
000fe00726
reference grammar: remove duplicate else_tail rule
2015-09-03 22:19:56 +03:00
benshu
986f523b89
Take method invocation semantics out of chapter on deref coercion.
2015-09-03 21:17:59 +02:00
Tshepang Lekhonkhobe
3525a13fea
book: "word" feels more suitable than "name"
...
Also, add missing comma
2015-09-03 21:14:03 +02:00
Aleksey Kladov
83aee74fce
reference grammar: loop label should be optional
...
This adds missing `?` marks to productions for loops and break/continue.
It also adds missing option label to while let loop
2015-09-03 22:13:50 +03:00
Tshepang Lekhonkhobe
8b2b949830
book: replace comma with a more suitable character
2015-09-03 21:11:44 +02:00
John Thomas
6fcdead4ee
Bash output fix to match real 'ruby embed.rb' call
...
The embed rust file that we compile prints out 'Thread finished..' messages along with a 'done!'
2015-09-02 23:13:56 -07:00
Xiao Chuan Yu
865d6c3b5b
Fix mistake in trait.md
2015-09-03 01:36:22 -04:00
Jack Wilson
28bf68f3fe
Makes formatting of struct keyword consistent
2015-09-02 18:58:18 -07:00
bors
cfd76b364c
Auto merge of #28135 - jackwilsonv:patch-1, r=steveklabnik
...
Small formatting change
r? @steveklabnik
2015-09-02 19:08:18 +00:00
bors
cb40b8a2ab
Auto merge of #28155 - vchimishuk:doc-rust-inside-other-languages-tab, r=alexcrichton
...
Fixed x variable identation. How it was displayed in Firefox before: http://s16.postimg.org/c9448tn0k/Screenshot_from_2015_09_01_17_35_43.jpg
2015-09-02 04:55:37 +00:00
bors
e758946f96
Auto merge of #28149 - jakerr:atomic, r=alexcrichton
...
Makes the code agree with the comment: 'value answers "am I locked?"'.
2015-09-02 03:13:43 +00:00
Viacheslav Chimishuk
5ae8a0d38f
Source code style fixed: tab replaced with whitespaces.
2015-09-01 17:49:08 +03:00
Jake Kerr
8213f01a76
Reverse AtomicBool value in nomicon example to agree with its comment.
...
Makes the code agree with the comment: 'value answers "am I locked?"'.
2015-09-01 17:32:22 +09:00
Jack Wilson
7665a7f016
Makes formatting of i32 consistent
2015-08-31 15:52:02 -07:00
AlexDenisov
b03b0d4c10
Fix typo
2015-08-31 06:44:27 +02:00
bors
477561de4e
Auto merge of #28078 - apasel422:patch-1, r=alexcrichton
2015-08-29 04:58:45 +00:00
bors
e9111e6a0e
Auto merge of #28070 - mdchoate:patch-1, r=alexcrichton
2015-08-29 03:20:37 +00:00
Andrew Paseltiner
010b7f3621
Remove superfluous line from Nomicon
2015-08-28 22:07:02 -04:00
Michael Choate
645d7ae739
Fix typo in loops.md
2015-08-28 14:34:15 -04:00
Steve Klabnik
1c44722375
Be explicit about using crates.io's libc crate
...
Fixes #28053
2015-08-28 11:43:23 -04:00
Manish Goregaokar
ab3dc54bcf
Rollup merge of #28022 - steveklabnik:gh27936, r=alexcrichton
...
Fixes #27936
2015-08-28 03:38:37 +05:30
Steve Klabnik
af58e5cfea
Add Windows-specific comments to testing guide
...
Fixes #27936
2015-08-27 13:43:43 -04:00
Nikolay Kondratyev
424d9c2778
Fix docs typo
2015-08-26 05:06:00 +05:00
Matt Brubeck
93616af42f
Document the recursion_limit crate attribute
2015-08-25 10:02:58 -07:00
Steve Klabnik
d9de182fa5
Rollup merge of #27982 - frewsxcv:patch-25, r=steveklabnik
2015-08-25 09:43:07 -04:00
Steve Klabnik
c15d0cf270
Rollup merge of #27978 - mgrabovsky:doc-fix, r=steveklabnik
2015-08-25 09:43:07 -04:00