Steve Klabnik
d1c7ae476b
Rollup merge of #21056 - steveklabnik:return_strings, r=sfackler
...
When we moved over to the book, we lost this.
2015-01-22 18:09:57 -05:00
Steve Klabnik
cef82952b2
Return the String guide to its former glory.
...
When we moved over to the book, we lost this.
2015-01-22 13:33:44 -05:00
bors
8160fc4786
Auto merge of #21078 - js-ojus:master, r=steveklabnik
...
* Include an illustration of a function that accepts two closures.
2015-01-22 16:50:17 +00: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
Jorge Aparicio
ed56c15ceb
remove NoSendItem
and NoSyncItem
2015-01-21 00:45:35 -05:00
Alfie John
1f50542a0d
docs: typo
2015-01-20 19:02:09 +00: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
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
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
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
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
Steve Klabnik
6553c0f5eb
Fix more rollup problems
2015-01-17 15:25:42 -05: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
we
812ce6c190
Remove unnecessary explicit conversions to *const T
2015-01-17 07:34:10 +03:00
Alex Crichton
38cb91e66c
syntax: Feature gate #[start] and #[main]
...
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-16 14:59:03 -08:00
bors
f3d71be65c
Merge pull request #21214 from sleepynate/spacing-in-book
...
Fix commented graphs in src/doc/trpl/ownership.md
Reviewed-by: huonw
2015-01-16 06:31:03 +00:00
nathan dotz
3626a308f3
Fix commented graphs in src/doc/trpl/ownership.md
2015-01-15 18:15:18 -05:00
Alex Crichton
5f32992b31
rollup merge of #21206 : steveklabnik/expressions
...
Suggested here: http://stackoverflow.com/a/27962076/24817
2015-01-15 14:12:08 -08:00
Alex Crichton
8c81800170
rollup merge of #21148 : bombless/patch-1
2015-01-15 14:11:55 -08:00
Alex Crichton
b86a84867a
rollup merge of #21141 : tcard/master
...
Really small correction.
This anti-example in the Closures section is supposed to fail because of a borrow, but it was failing at the type inference because of insufficient type information.
This makes it fail for the expected reason.
2015-01-15 14:11:54 -08:00
Alex Crichton
65b286d834
rollup merge of #21109 : steveklabnik/gh17224
...
Fixes #17224
2015-01-15 14:11:48 -08:00
Alex Crichton
d7009e6f31
rollup merge of #21105 : csouth3/kill-box-import
...
Closes #21093 .
r? @steveklabnik
cc @alexcrichton
I tested with `make check-docs` and this passes that. Hope that was enough.
2015-01-15 14:11:46 -08:00
Alex Crichton
7aa7707af9
rollup merge of #21040 : steveklabnik/gh20037
...
Fixes #20037 .
2015-01-15 14:11:37 -08:00
Alex Crichton
9d6e1f921b
rollup merge of #21038 : steveklabnik/gh20471
...
Fixes #20471 .
2015-01-15 14:11:36 -08:00
Alex Crichton
21effeb611
rollup merge of #21031 : steveklabnik/gh19067
...
Fixes #19067
2015-01-15 14:11:35 -08:00
Alex Crichton
8d0b937964
rollup merge of #21029 : steveklabnik/gh19924
...
Fixes #19924
2015-01-15 14:11:35 -08:00
Alex Crichton
cfbf313282
rollup merge of #21023 : steveklabnik/gh20840
...
Fixes #20840
2015-01-15 14:11:34 -08:00
Alex Crichton
e06863ef64
rollup merge of #21015 : steveklabnik/gh20852
...
Fixes #20852
2015-01-15 14:11:33 -08:00
Alex Crichton
c6a9877039
rollup merge of #21013 : steveklabnik/gh20914
...
Fixes #20914
2015-01-15 14:11:33 -08:00
Alex Crichton
73660a11c9
rollup merge of #21011 : steveklabnik/gh20993
...
Fixes #20993
2015-01-15 14:11:32 -08:00