about summary refs log tree commit diff
path: root/src/doc
AgeCommit message (Collapse)AuthorLines
2015-01-23Auto merge of #21374 - dgrunwald:range-notation-fixes, r=nikomatsakisbors-4/+3
This PR is intended as alternative to #20958. It fixes the same grammar inconsistencies, but does not increase the operator precedence of `..`, leaving it at the same level as the assignment operator. For previous discussion, see #20811 and #20958. Grammar changes: * allow `for _ in 1..i {}` (fixes #20241) * allow `for _ in 1.. {}` as infinite loop * prevent use of range notation in contexts where only operators of high precedence are expected (fixes #20811) Parser code cleanup: * remove `RESTRICTION_NO_DOTS` * make `AS_PREC` const and follow naming convention * make `min_prec` inclusive r? nikomatsakis
2015-01-22Rollup merge of #21517 - SeanTAllen:master, r=steveklabnikSteve Klabnik-8/+8
Lifetime elision documentation was reference a previously existing function that doesn't exist. After talking with Steve Klabnik, I confirmed the correct function to be referenced and updated documentation accordingly.
2015-01-22Rollup merge of #21479 - steveklabnik:rustdoc_to_book, r=alexcrichtonSteve Klabnik-294/+298
Fixes #21430
2015-01-22Rollup merge of #21450 - alfie:book2, r=steveklabnikSteve Klabnik-2/+1
Compiling won't produce an executable just yet because (as stated in the next paragraph) there are errors. By removing this sentance, the reader won't get confused when they expect a successful compile i.e. if they don't read ahead one paragraph, they are going to be checking their code and wondering why it's not compiling.
2015-01-22Rollup merge of #21373 - angst7:pointer_doc_1, r=steveklabnikSteve Klabnik-4/+4
Updated incorrect error messages, and removed explicit return statements from example code.
2015-01-22Rollup merge of #21091 - steveklabnik:add_attribute_docs, r=huonwSteve Klabnik-0/+12
Fixes #6444 I need some help with the macro docs here, as I couldn't figure it out. @kmcallister @eddyb or someone else?
2015-01-22Rollup merge of #21056 - steveklabnik:return_strings, r=sfacklerSteve Klabnik-0/+284
When we moved over to the book, we lost this.
2015-01-22Document remaining attributes and macrosSteve Klabnik-0/+12
Fixes #6444
2015-01-22Fix some grammar inconsistencies for the '..' range notation.Daniel Grunwald-4/+3
Grammar changes: * allow 'for _ in 1..i {}' (fixes #20241) * allow 'for _ in 1.. {}' as infinite loop * prevent use of range notation in contexts where only operators of high precedence are expected (fixes #20811) Parser code cleanup: * remove RESTRICTION_NO_DOTS * make AS_PREC const and follow naming convention * make min_prec inclusive
2015-01-22Return the String guide to its former glory.Steve Klabnik-0/+284
When we moved over to the book, we lost this.
2015-01-22Reference correct fn during lifetime ellisionSean T Allen-8/+8
2015-01-22Auto merge of #21078 - js-ojus:master, r=steveklabnikbors-8/+35
* Include an illustration of a function that accepts two closures.
2015-01-21Move rustdoc.md into the bookSteve Klabnik-294/+298
Fixes #21430
2015-01-21rollup merge of #20179: eddyb/blind-itemsAlex Crichton-23/+9
Conflicts: src/librustc/diagnostics.rs src/librustdoc/clean/mod.rs src/librustdoc/html/format.rs src/libsyntax/parse/parser.rs
2015-01-21rollup merge of #21258: aturon/stab-3-indexAlex Crichton-8/+6
Conflicts: src/libcore/ops.rs src/librustc_typeck/astconv.rs src/libstd/io/mem.rs src/libsyntax/parse/lexer/mod.rs
2015-01-21Fix type inference problems in tests and docsAaron Turon-8/+6
2015-01-21rollup merge of #21433: alfie/typobookAlex Crichton-1/+1
Tiny fix
2015-01-21rollup merge of #21394: japaric/nononoAlex Crichton-5/+1
r? @FlaPer87
2015-01-21rollup merge of #21393: loganchien/fix-if-stmt-doc-titleAlex Crichton-1/+1
Slightly change the title to make it look more consistent with other chapters (e.g. Match.)
2015-01-21Fallout from stabilization.Aaron Turon-2/+2
2015-01-21docs: fix fallout of merging ast::ViewItem into ast::Item.Eduard Burtescu-23/+9
2015-01-21remove `NoSendItem` and `NoSyncItem`Jorge Aparicio-5/+1
2015-01-21docs: Update for clarityAlfie John-2/+1
Compiling won't produce an executable just yet because (as stated in the next paragraph) there are errors. By removing this sentance, the reader won't get confused when they expect a successful compile i.e. if they don't read ahead one paragraph, they are going to be checking their code and wondering why it's not compiling.
2015-01-20Auto merge of #21439 - alexcrichton:rollup, r=alexcrichtonbors-134/+134
Continuation of https://github.com/rust-lang/rust/pull/21428
2015-01-20Test fixes and rebase conflictsAlex Crichton-5/+5
2015-01-20docs: typoAlfie John-1/+1
2015-01-21Rollup merge of #21179 - nodakai:reference-mod-to-self, r=huonwBarosl LEE-4/+4
This should have been done together with 56dcbd17fdad5d39b7b02e22a7490d2468718d08 for rust-lang/rust#20361
2015-01-21Rollup merge of #21427 - steveklabnik:generics_fix, r=alexcrichtonBarosl LEE-3/+3
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-21Rollup merge of #21375 - petrochenkov:ssbsl, r=alexcrichtonBarosl LEE-1/+1
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-21Rollup merge of #21359 - WiSaGaN:bugfix/fix_marker, r=alexcrichtonBarosl LEE-2/+2
From std::markers to std::marker.
2015-01-21Rollup merge of #21358 - glacjay:patch-2, r=alexcrichtonBarosl LEE-0/+1
2015-01-21Rollup merge of #21357 - kimroen:patch-1, r=sanxiynBarosl LEE-3/+2
Having both "Right now" and "at the moment" in the same statement is redundant.
2015-01-21Rollup merge of #21345 - glacjay:patch-1, r=alexcrichtonBarosl LEE-1/+1
The reference should be `x`, not `FOO` itself.
2015-01-21Rollup merge of #21048 - aroben:patch-1, r=steveklabnikBarosl LEE-1/+1
Now both the enum values and the prose describing them mention the values in the same order.
2015-01-21Rollup merge of #21294 - alfie:typo, r=steveklabnikBarosl LEE-1/+1
Wrong verb.
2015-01-21Rollup merge of #21355 - alfie:suffix, r=steveklabnikBarosl LEE-107/+107
More [u]int => [i|u]size and [i|u] => [i|u]s changes
2015-01-21Rollup merge of #21280 - timparenti:old-guide-stub-grammar, r=alexcrichtonBarosl LEE-12/+12
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-21Rollup merge of #20998 - estsauver:20984, r=steveklabnikBarosl LEE-1/+1
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-20Small fix in TRPL 3.9Steve Klabnik-3/+3
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-20Auto merge of #19353 - icorderi:docs/grammar, r=steveklabnikbors-0/+777
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-20Auto merge of #21257 - alexcrichton:issue-20064, r=pnkfelixbors-4/+4
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-20Change the title of if statement in trpl book.Logan Chien-1/+1
2015-01-18quick formatting fixMatt Roche-5/+1
2015-01-18Error message fixes and removed explicit returns in example codeMatt Roche-4/+8
2015-01-18Fix std::marker.Wangshan Lu-2/+2
From std::markers to std::marker.
2015-01-18fix formattingJay True-0/+1
2015-01-18docs: replacing more deprecated integer suffixesAlfie John-80/+80
2015-01-18Remove redundant "Right now"Kim Røen-3/+2
Having both "Right now" and "at the moment" in the same statement is redundant.
2015-01-18docs: replace deprecated integer suffixes from examplesAlfie John-28/+28
2015-01-18fix an error about the static lifetimeJay True-1/+1
The reference should be `x`, not `FOO` itself.