2403 Commits

Author SHA1 Message Date
Manish Goregaokar
b613ef552d Rollup merge of #25580 - killercup:trpl/unify-code-blocks, r=steveklabnik
This adds strictly more information to the source files and reduces the need for customized tooling to render the book. (While this should not change the output of _rustbook_, it is very useful when rendering the sources with external tools like Pandoc.)

This only adds the language marker to "first level" code blocks (and not to code blocks in comments inside of code examples).

r? @steveklabnik
2015-05-19 18:47:15 +05:30
Manish Goregaokar
02b79c4763 Rollup merge of #25575 - clatour:patch-2, r=steveklabnik
Looks like this was an issue in the source material. I've let the editor know and he has told me he is correcting it there as well.

r? @steveklabnik
2015-05-19 18:47:14 +05:30
Manish Goregaokar
392576b6d8 Rollup merge of #25512 - peferron:doc-traits-error-fix, r=alexcrichton
The source code snippet uses `"whatever".as_bytes()` but the compilation error message uses `b"whatever"`. Both should be consistent with each other.

r? @steveklabnik
2015-05-19 18:47:13 +05:30
Manish Goregaokar
fddd89319d Rollup merge of #25452 - jimblandy:master, r=steveklabnik
Minor tweak: the text explaining the Borrow trait talks about slices, but the example immediately following just uses a simple reference; there are no slices involved.

r? @steveklabnik
2015-05-19 18:47:13 +05:30
Pascal Hertleif
f3adea5ce9 TRPL: Normalize rust Code Block Markers
`{rust,ignore}` -> `rust,ignore
2015-05-18 21:10:00 +02:00
Pascal Hertleif
6f69cd6387 TRPL: Add rust Marker to Some Code Block
This adds strictly more information to the source files and reduces the
need for customized tooling to render the book.

(While this should not change the output of _rustbook_, it is very
useful when rendering the sources with external tools like Pandoc.)
2015-05-18 20:56:00 +02:00
clatour
83df71d6c5 trpl: Dining philosophers backstory typo
Minor typo/grammar error.
2015-05-18 11:41:59 -06:00
peferron
a10d243dd4 Use byte string literal syntax
The byte string literal syntax `b"whatever"` is more idiomatic than
`"whatever".as_bytes()`.
2015-05-17 21:19:12 -07:00
Manish Goregaokar
252027768e Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alexcrichton
Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :)

The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either.

r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
2015-05-18 08:55:38 +05:30
Manish Goregaokar
6f2a069b9c Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton 2015-05-18 08:55:37 +05:30
peferron
82447cf500 Fix doc whitespace issues 2015-05-17 03:00:04 -07:00
Chris Hellmuth
09a473ea7b Fix typo in references-and-borrowing docs 2015-05-17 00:19:53 -07:00
Manish Goregaokar
1fd0a8455b Rollup merge of #25506 - Wilfred:master, r=alexcrichton
Newcomers to Rust need to learn the distinctinion between `&str` and
`String`, so additonally having `string` in an example risks confusion.
2015-05-17 11:55:39 +05:30
Manish Goregaokar
094d29cf09 Rollup merge of #25493 - coffeejunk:update_installed_rust_version, r=alexcrichton
Rust is out of beta 🎉 

r? @steveklabnik
2015-05-17 11:55:39 +05:30
Manish Goregaokar
b40fcf5b10 Rollup merge of #25490 - huachaohuang:patch-1, r=alexcrichton 2015-05-17 11:55:39 +05:30
Manish Goregaokar
4d3db38940 Rollup merge of #25484 - sumito3478:fix-deadlink-in-complement-lang-faq, r=alexcrichton
In "The Rust Language FAQ", some of the links to example projects/modules written in Rust are dead links. This PR updates them.
2015-05-17 11:55:38 +05:30
Manish Goregaokar
a25925a3d4 Rollup merge of #25472 - WillEngler:book-tiny-typo-fixes, r=alexcrichton
This PR fixes two little typos in the Dining Philosophers example.

Also, there are two style points that may have been oversights but may have been deliberate, so I'll just bring them up here:

1) In the last paragraph, you say

> You’ll notice we can introduce a new binding to `table` here, and it will shadow the old one. This is often used so that you don’t need to come up with two unique names.

You already said something similar to this in the Guessing Game, but maybe you intended for this example to be independent of that one.

2) In "Rust Inside Other Languages," you introduce the idea of the "global interpreter lock" and then refer to it as the GIL a few paragraphs later without explicitly stating that GIL == global interpreter lock. It's reasonable to expect readers to make the connection, but maybe that's not what you intended.

Excellent work on the examples! Congrats on 1.0!

r? @steveklabnik
2015-05-17 11:55:38 +05:30
peferron
55c8bacc3a Make error message consistent with source code
The source code uses `"whatever".as_bytes()`, not `b"whatever"`.
2015-05-16 17:01:25 -07:00
Wilfred Hughes
ba02739ad3 Avoid calling a variable 'string' when discussing strings.
Newcomers to Rust need to learn the distinctinion between `&str` and
`String`, so additonally having `string` in an example risks confusion.
2015-05-16 23:56:45 +01:00
bors
2da9efefca Auto merge of #25463 - jeremyschlatter:master, r=alexcrichton 2015-05-16 22:29:56 +00:00
Maximilian Haack
e095e3963e Update windows install links to 1.0
Fixes #25489
2015-05-16 19:18:52 +02:00
Maximilian Haack
76fa4f427b Update the shown installed rust version to 1.0
🎉 🎉 🎉
2015-05-16 17:20:07 +02:00
Huachao Huang
6e8e6a4b08 Update rust-inside-other-languages.md 2015-05-16 21:44:02 +08:00
sumito3478
f641bd8396 Fix deadlinks in complement-lang-faq.md 2015-05-16 18:06:22 +09:00
bors
0becf6aec7 Auto merge of #25453 - jimblandy:FQA-fiasco-link, r=alexcrichton
Fix the link to the "static initialization order fiasco" discussion in the C++ Frequently Questioned Answers.

At present the link points to a mail message summarizing the decision not to have resumable exceptions, but the FAQ means to refer to a discussion of the "static initialization order fiasco". I've made my best guess at what it meant to refer to.
2015-05-16 08:37:31 +00:00
bors
15c18e725c Auto merge of #25450 - dnaeon:docs, r=alexcrichton 2015-05-16 07:01:32 +00:00
bors
4ce08a5d70 Auto merge of #25440 - durka:patch-3, r=alexcrichton
The Traits chapter uses "adding methods to `int`" as an example of "something bad", but there is no such thing as `int` anymore, right? So I changed it to `i32`.
2015-05-16 02:11:11 +00:00
Will Engler
d5394d00d1 Correct two small typos in the Dining Philosophers example. 2015-05-15 19:32:13 -06:00
Jeremy Schlatter
3709e8f92b Fix quotation mark in ruby example. 2015-05-15 16:08:15 -07:00
bors
daaf715539 Auto merge of #25432 - killercup:patch-12, r=steveklabnik
`[let]` was already defined in line 11. Pandoc shows a warning for this. I'm not sure if it's actually invalid Markdown.

r? @steveklabnik
2015-05-15 22:55:03 +00:00
bors
a9ea33fa30 Auto merge of #25437 - MazinZ1:master, r=alexcrichton
The download links of Windows installers on the Nightly Rust page are using beta builds instead of nightly builds, which caused some confusions when I was setting up my env. Probably it's better to use the links of nightly builds here.
2015-05-15 21:17:42 +00:00
Jim Blandy
0b04b17183 Make description of Borrow trait uses match the example. 2015-05-15 12:44:24 -07:00
Marin Atanasov Nikolov
92e44b0422 docs: Typo fix 2015-05-15 21:46:59 +03:00
Alex Burka
900f27dc7c trpl: change from "int" to "i32" in Traits
The Traits chapter uses "adding methods to `int`" as an example of "something bad", but there is no such thing as `int` anymore, right? So I changed it to `i32`.
2015-05-15 12:14:39 -04:00
Z1
26560e75b7 Fix download links of Nightly Windows installers
The download links of Windows installers on the Nightly Rust page are using beta builds instead of nightly builds, which caused some confusions when I was setting up my env. Probably it's better to use the links of nightly builds here.
2015-05-15 10:52:47 -04:00
bors
13a4b83c1a Auto merge of #25402 - parir:master, r=Manishearth
r? @steveklabnik
2015-05-15 13:35:49 +00:00
Pascal Hertleif
94be1153f1 TRPL: Fix Inline Code Typography 2015-05-15 14:42:58 +02:00
Pascal Hertleif
7d0ae692c9 TRPL: Remove Duplicate Reference
Pandoc shows a warning for this. I'm not sure if it's actually invalid Markdown.
2015-05-15 12:23:26 +02:00
parir
94ecc372b2 5 != 4
Closes #25430
2015-05-15 11:28:32 +02:00
Steve Klabnik
6df13d4d88 Rollup merge of #25420 - habnabit:master, r=steveklabnik
It seems to refer to something that used to exist, but got moved, and then not everything got cleaned up.
2015-05-14 20:30:44 -04:00
Steve Klabnik
5501f076c2 Rollup merge of #25418 - leunggamciu:patch-trpl, r=steveklabnik 2015-05-14 20:30:43 -04:00
Steve Klabnik
aa560115b0 Rollup merge of #25413 - killercup:patch-11, r=alexcrichton
r? @steveklabnik
2015-05-14 20:30:43 -04:00
Steve Klabnik
dd60abc697 Rollup merge of #25410 - durka:patch-2, r=steveklabnik 2015-05-14 20:30:42 -04:00
Steve Klabnik
765a55ed20 Rollup merge of #25408 - Nashenas88:rust-book-stack-and-heap-typo, r=steveklabnik
I fixed the typo of the value of e in the memory tables. It is a reference to d, and so it should contain the memory location of d. I also fixed the incorrectly formatted tables so they display properly in html pages.
2015-05-14 20:30:42 -04:00
Steve Klabnik
c3562110d0 Rollup merge of #25407 - durka:patch-1, r=alexcrichton 2015-05-14 20:30:42 -04:00
Steve Klabnik
0028f855e2 Rollup merge of #25405 - dreid:patch-3, r=nikomatsakis 2015-05-14 20:30:42 -04:00
Steve Klabnik
1f40cde836 Rollup merge of #25404 - dnaeon:doc-fixes, r=steveklabnik
This PR fixes a comment in the `while Loops` section of the Rust book with the correct type of a variable binding.
2015-05-14 20:30:41 -04:00
Aaron Gallagher
568f13ac70 Remove an almost-duplicated sentence.
It seems to refer to something that used to exist, but got moved, and
then not everything got cleaned up.
2015-05-14 17:04:00 -07:00
leunggamciu
82c7282bec trpl: Fix missing internal links 2015-05-15 06:25:01 +08:00
Pascal Hertleif
a1577db825 TRPL: Fix Internal Link 2015-05-14 21:24:09 +02:00