Alex Crichton
df1cddf20a
rollup merge of #20179 : eddyb/blind-items
...
Conflicts:
src/librustc/diagnostics.rs
src/librustdoc/clean/mod.rs
src/librustdoc/html/format.rs
src/libsyntax/parse/parser.rs
2015-01-21 11:56:00 -08:00
Alex Crichton
886c6f3534
rollup merge of #21258 : aturon/stab-3-index
...
Conflicts:
src/libcore/ops.rs
src/librustc_typeck/astconv.rs
src/libstd/io/mem.rs
src/libsyntax/parse/lexer/mod.rs
2015-01-21 11:53:49 -08:00
Aaron Turon
537889aa78
Fix type inference problems in tests and docs
2015-01-21 11:16:00 -08:00
Alex Crichton
de89dc883e
rollup merge of #21433 : alfie/typobook
...
Tiny fix
2015-01-21 09:16:38 -08:00
Alex Crichton
4b6a0563c6
rollup merge of #21394 : japaric/nonono
...
r? @FlaPer87
2015-01-21 09:14:42 -08:00
Alex Crichton
e4434f97af
rollup merge of #21393 : loganchien/fix-if-stmt-doc-title
...
Slightly change the title to make it look more consistent with other chapters (e.g. Match.)
2015-01-21 09:14:41 -08:00
Aaron Turon
a506d4cbfe
Fallout from stabilization.
2015-01-21 08:11:07 -08:00
Eduard Burtescu
838b2ea760
docs: fix fallout of merging ast::ViewItem into ast::Item.
2015-01-21 16:27:26 +02:00
Jorge Aparicio
ed56c15ceb
remove NoSendItem
and NoSyncItem
2015-01-21 00:45:35 -05:00
bors
29bd9a06ef
Auto merge of #21439 - alexcrichton:rollup, r=alexcrichton
...
Continuation of https://github.com/rust-lang/rust/pull/21428
2015-01-20 23:03:09 +00:00
Alex Crichton
631896dc19
Test fixes and rebase conflicts
2015-01-20 12:35:51 -08:00
Alfie John
1f50542a0d
docs: typo
2015-01-20 19:02:09 +00:00
Barosl LEE
9752924dff
Rollup merge of #21179 - nodakai:reference-mod-to-self, r=huonw
...
This should have been done together with 56dcbd17fd
for rust-lang/rust#20361
2015-01-21 02:16:53 +09:00
Barosl LEE
01ae97b45e
Rollup merge of #21427 - steveklabnik:generics_fix, r=alexcrichton
...
Multiple people have asked me if this is a reference to Hacker News, and
I _certainly_ don't want to give them that impression.
2015-01-21 02:16:52 +09:00
Barosl LEE
a79f1921a9
Rollup merge of #21375 - petrochenkov:ssbsl, r=alexcrichton
...
After PR #19766 added implicit coersions `*mut T -> *const T`, the explicit casts can be removed.
(The number of such casts turned out to be relatively small).
2015-01-21 02:16:50 +09:00
Barosl LEE
75efb22808
Rollup merge of #21359 - WiSaGaN:bugfix/fix_marker, r=alexcrichton
...
From std::markers to std::marker.
2015-01-21 02:16:49 +09:00
Barosl LEE
33ea011574
Rollup merge of #21358 - glacjay:patch-2, r=alexcrichton
2015-01-21 02:16:49 +09:00
Barosl LEE
567bf6ca8c
Rollup merge of #21357 - kimroen:patch-1, r=sanxiyn
...
Having both "Right now" and "at the moment" in the same statement is redundant.
2015-01-21 02:16:49 +09:00
Barosl LEE
4419fa39c2
Rollup merge of #21345 - glacjay:patch-1, r=alexcrichton
...
The reference should be `x`, not `FOO` itself.
2015-01-21 02:16:48 +09:00
Barosl LEE
b3f6e82beb
Rollup merge of #21048 - aroben:patch-1, r=steveklabnik
...
Now both the enum values and the prose describing them mention the values in the same order.
2015-01-21 02:16:47 +09:00
Barosl LEE
d8a892303c
Rollup merge of #21294 - alfie:typo, r=steveklabnik
...
Wrong verb.
2015-01-21 02:16:46 +09:00
Barosl LEE
b7afe5ec27
Rollup merge of #21355 - alfie:suffix, r=steveklabnik
...
More [u]int => [i|u]size and [i|u] => [i|u]s changes
2015-01-21 02:16:46 +09:00
Barosl LEE
9db869b348
Rollup merge of #21280 - timparenti:old-guide-stub-grammar, r=alexcrichton
...
This removes the extra "the" from the phrase "the the Rust Programming Language book", which isn't particularly grammatical, in stub documents introduced in #20802 to direct users from the old guides to the corresponding sections of the book.
2015-01-21 02:16:45 +09:00
Barosl LEE
1d8b917811
Rollup merge of #20998 - estsauver:20984, r=steveklabnik
...
There are a large number of places that incorrectly refer
to deriving in comments, instead of derives.
If someone could look at src/etc/generate-deriving-span-tests.py,
I'm not sure how those tests were passing before/if they were.
2015-01-21 02:16:45 +09:00
Steve Klabnik
e361b38888
Small fix in TRPL 3.9
...
Multiple people have asked me if this is a reference to Hacker News, and
I _certainly_ don't want to give them that impression.
2015-01-20 11:36:29 -05:00
bors
a0f86de497
Auto merge of #19353 - icorderi:docs/grammar, r=steveklabnik
...
Original [issue](https://github.com/rust-lang/rust/issues/19278 ) that inspired this patch.
The [reference.md] has evolved past simple grammatical constructs, and it serves a different purpose.
The intent for the proposed _grammar.md_ is to hold **only** the official reference for the language grammar. This document would keep track of grammatical changes to the language over time, facilitate discussions over proposed changes to the existing grammar, and serve as basis for building parsers by third-parties (IDE's, GitHub linguist, CodeMirror, etc.).
The current state of the PR contains all the grammars that were available in [reference.md] and nothing else.
There are still a lot of missing pieces that weren't available. The following are just a few of the definitions missing:
- [Functions](https://github.com/icorderi/rust/blob/docs/grammar/src/doc/grammar.md#functions )
- [Structures](https://github.com/icorderi/rust/blob/docs/grammar/src/doc/grammar.md#structures )
- [Traits](https://github.com/icorderi/rust/blob/docs/grammar/src/doc/grammar.md#traits )
- [Implementations](https://github.com/icorderi/rust/blob/docs/grammar/src/doc/grammar.md#implementations )
- [Operators](https://github.com/icorderi/rust/blob/docs/grammar/src/doc/grammar.md#unary-operator-expressions )
- [Statements](https://github.com/icorderi/rust/blob/docs/grammar/src/doc/grammar.md#statements )
- [Expressions](https://github.com/icorderi/rust/blob/docs/grammar/src/doc/grammar.md#expressions )
[reference.md]: https://github.com/rust-lang/rust/blob/master/src/doc/reference.md
We need help from people familiar with those grammatical constructs to fill in the missing pieces.
2015-01-20 16:05:33 +00:00
bors
e375a892f1
Auto merge of #21257 - alexcrichton:issue-20064, r=pnkfelix
...
These two attributes are used to change the entry point into a Rust program, but
for now they're being put behind feature gates until we have a chance to think
about them a little more. The #[start] attribute specifically may have its
signature changed.
This is a breaking change to due the usage of these attributes generating errors
by default now. If your crate is using these attributes, add this to your crate
root:
#![feature(start)] // if you're using the #[start] attribute
#![feature(main)] // if you're using the #[main] attribute
cc #20064
2015-01-20 02:23:49 +00:00
Logan Chien
8c3d914ca4
Change the title of if statement in trpl book.
2015-01-20 00:41:59 +08:00
Wangshan Lu
e28da7ad44
Fix std::marker.
...
From std::markers to std::marker.
2015-01-18 22:17:44 +08:00
Jay True
ab73d455fe
fix formatting
2015-01-18 21:23:22 +08:00
Alfie John
5431727b6e
docs: replacing more deprecated integer suffixes
2015-01-18 12:43:12 +00:00
Kim Røen
17ffe51aa3
Remove redundant "Right now"
...
Having both "Right now" and "at the moment" in the same statement is redundant.
2015-01-18 13:24:13 +01:00
Alfie John
66003c06a1
docs: replace deprecated integer suffixes from examples
2015-01-18 11:49:37 +00:00
Jay True
2b6efbf92d
fix an error about the static lifetime
...
The reference should be `x`, not `FOO` itself.
2015-01-18 10:58:55 +08:00
Alfie John
8da284a045
docs: typo
2015-01-17 23:31:13 +00:00
Steve Klabnik
6553c0f5eb
Fix more rollup problems
2015-01-17 15:25:42 -05:00
Earl St Sauver
6ab95bdd62
s/deriving/derives in Comments/Docs
...
There are a large number of places that incorrectly refer
to deriving in comments, instead of derives.
Fixes #20984
2015-01-17 11:08:02 -08:00
Alfie John
2c64023e3e
docs: grammar fix
2015-01-17 10:51:53 -05:00
Nick Howell
0c26524134
doc: Remove extra whitespace in the middle of lines to provide alignment
...
"Idiomatic code should not use extra whitespace in the middle of a line to provide alignment."
http://aturon.github.io/style/whitespace.html
I realize the linked page still needs an RFC, but the docs should be written in accordance with the guidelines nevertheless.
2015-01-17 10:51:53 -05:00
Steve Klabnik
433ea0bd55
Add C -> Rust example to FFI chapter of the book.
...
Fixes #10489 .
2015-01-17 10:51:07 -05:00
Steve Klabnik
d5091c9cc9
Fix up titles of TRPL chapters
2015-01-17 10:51:07 -05:00
Ms2ger
0109ceaf82
Fix typo.
2015-01-17 10:51:07 -05:00
Steve Klabnik
899ffcf62a
Intpocalypse, book edition.
...
Fix all usage of int/uint/i/u in the book.
2015-01-17 10:51:07 -05:00
Steve Klabnik
078bd498b9
Evaluate # fn in docs
...
I searched for times when we were hiding functions with # in the documentation,
and fixed them to not use it unless neccesary.
I also made random improvements whenever I changed something. For example,
I changed Example to Examples, for consistency.
Fixes #13423
2015-01-17 10:49:49 -05:00
Steve Klabnik
a03701defa
Remove segmented stack info from the FFI chapter of the book.
...
Fixes #20071 .
2015-01-17 10:49:49 -05:00
Andrew Barchuk
5f1ba93ad2
Replace obsolete constructions in into examples
...
Replace deprecated integer suffixes. Remove integer type notations
altogether where possible. Replace uses of deprecated `range()`
function with range notation.
2015-01-17 10:49:49 -05:00
Andrew Barchuk
f77208972a
Remove Thread::detach() call from intro example
...
The mentioned method are no longer part of Thread. Spawned threads are
detached by default as of now.
2015-01-17 10:49:49 -05:00
Andrew Barchuk
9ed27df180
Fix intro concurrency examples compilation warns
...
* Use range notation instead of deprecated `range()`
* Remove deprecated `u` integer suffixes used in ranges
* Replace deprecated `i` integer suffixes with `is` for vector numbers
`Thread::spawn()` still gives "use of unstable item" warning which I
hadn't found a way to fix.
2015-01-17 10:49:49 -05:00
Steve Klabnik
a2e277edf4
Add enum discriminats to the reference.
...
Fixes #15755
2015-01-17 10:49:49 -05:00
we
812ce6c190
Remove unnecessary explicit conversions to *const T
2015-01-17 07:34:10 +03:00