Jorge Aparicio
f9865eac18
fix fallout
2015-01-30 10:37:44 -05:00
bors
265a23320d
Auto merge of #21677 - japaric:no-range, r=alexcrichton
...
Note: Do not merge until we get a newer snapshot that includes #21374
There was some type inference fallout (see 4th commit) because type inference with `a..b` is not as good as with `range(a, b)` (see #21672 ).
r? @alexcrichton
2015-01-29 16:28:52 +00:00
Jorge Aparicio
788181d405
s/Show/Debug/g
2015-01-29 07:49:02 -05:00
Manish Goregaokar
7abbc96e66
Rollup merge of 21708 - brson:internals, r=huonw
2015-01-29 03:13:53 +05:30
Manish Goregaokar
c709ed2faf
Merge remote-tracking branch 'origin/master' into rollup
...
Conflicts:
src/libcollections/slice.rs
src/libcore/nonzero.rs
src/libcore/ops.rs
2015-01-28 23:31:03 +05:30
Brian Anderson
94404070d6
discuss.rust-lang.org -> internals.rust-lang.org
2015-01-27 15:44:05 -08:00
Brian Anderson
7122305053
Merge remote-tracking branch 'rust-lang/master'
...
Conflicts:
src/libcore/cell.rs
src/librustc_driver/test.rs
src/libstd/old_io/net/tcp.rs
src/libstd/old_io/process.rs
2015-01-27 15:05:04 -08:00
Manish Goregaokar
36d0e90e6b
Rollup merge of #21623 - dinfuehr:patch-1, r=alexcrichton
2015-01-27 22:24:03 +05:30
Manish Goregaokar
cb63bcb98c
Rollup merge of #21618 - snowe2010:documentation, r=Gankro
...
Lifetime elision with two input references is not clear.
Closes #21284
2015-01-27 22:24:03 +05:30
Manish Goregaokar
54cdae693c
Rollup merge of #21612 - bombless:patch-3, r=alexcrichton
2015-01-27 22:24:03 +05:30
Manish Goregaokar
51ff9e82ec
Rollup merge of #21602 - japaric:derive-copy, r=alexcrichton
2015-01-27 22:24:02 +05:30
Alex Crichton
3a07f859b8
Fallout of io => old_io
2015-01-26 16:01:16 -08:00
Brian Anderson
5a6fb8eb98
Merge remote-tracking branch 'rust-lang/master'
...
Conflicts:
src/librustc/lint/builtin.rs
src/librustc/lint/context.rs
2015-01-26 15:42:32 -08:00
Brian Anderson
d179ba3b8e
Merge remote-tracking branch 'rust-lang/master'
...
Conflicts:
src/libcore/cmp.rs
src/libcore/fmt/mod.rs
src/libcore/iter.rs
src/libcore/marker.rs
src/libcore/num/f32.rs
src/libcore/num/f64.rs
src/libcore/result.rs
src/libcore/str/mod.rs
src/librustc/lint/builtin.rs
src/librustc/lint/context.rs
src/libstd/sync/mpsc/mod.rs
src/libstd/sync/poison.rs
2015-01-25 22:14:06 -08:00
Eduard Burtescu
e0afa82c67
Remove every mention of "onceness".
2015-01-26 04:15:09 +02:00
Jorge Aparicio
bff462302b
cleanup: s/impl Copy/#[derive(Copy)]/g
2015-01-25 11:20:38 -05:00
Dominik Inführ
a09c085976
more-strings.md: repaired links to API
2015-01-25 15:20:49 +01:00
Brian Anderson
63fcbcf3ce
Merge remote-tracking branch 'rust-lang/master'
...
Conflicts:
mk/tests.mk
src/liballoc/arc.rs
src/liballoc/boxed.rs
src/liballoc/rc.rs
src/libcollections/bit.rs
src/libcollections/btree/map.rs
src/libcollections/btree/set.rs
src/libcollections/dlist.rs
src/libcollections/ring_buf.rs
src/libcollections/slice.rs
src/libcollections/str.rs
src/libcollections/string.rs
src/libcollections/vec.rs
src/libcollections/vec_map.rs
src/libcore/any.rs
src/libcore/array.rs
src/libcore/borrow.rs
src/libcore/error.rs
src/libcore/fmt/mod.rs
src/libcore/iter.rs
src/libcore/marker.rs
src/libcore/ops.rs
src/libcore/result.rs
src/libcore/slice.rs
src/libcore/str/mod.rs
src/libregex/lib.rs
src/libregex/re.rs
src/librustc/lint/builtin.rs
src/libstd/collections/hash/map.rs
src/libstd/collections/hash/set.rs
src/libstd/sync/mpsc/mod.rs
src/libstd/sync/mutex.rs
src/libstd/sync/poison.rs
src/libstd/sync/rwlock.rs
src/libsyntax/feature_gate.rs
src/libsyntax/test.rs
2015-01-25 01:20:55 -08:00
Tyler Thrailkill
a0ed0f30ba
Add example for Lifetime Elision with two inputs
...
Lifetime elision with two input references is not clear.
Closes #21284
2015-01-25 01:24:41 -07:00
York Xiang
ac3b4b8074
fix wrong link
2015-01-25 12:36:15 +08:00
Flavio Percoco Premoli
df2ab66044
Rollup merge of #21560 - steveklabnik:remove_discuss_link, r=sanxiyn
...
We've had some new people post questions to Discuss, so this should be removed for now. http://discuss.rust-lang.org/t/did-you-mean-to-point-to-discuss-rust-lang-org-as-a-user-forum/1381
2015-01-24 10:42:42 +01:00
Flavio Percoco Premoli
dc32dfaccf
Rollup merge of #21535 - steveklabnik:gh19759, r=alexcrichton
...
Fixes #19759
I'm not going to bother to do more than this, as it'll end up getting re-done as part of the reference work, but at least it's correct now.
2015-01-24 10:42:40 +01:00
Flavio Percoco Premoli
fd6fb165bd
Rollup merge of #21532 - steveklabnik:gh21531, r=alexcrichton
...
Fixes #21531
2015-01-24 10:42:40 +01:00
Flavio Percoco Premoli
d19f28b2f2
Rollup merge of #21108 - steveklabnik:gh16969, r=alexcrichton
...
Fixes #16969
2015-01-24 10:42:39 +01:00
Steve Klabnik
91037a417e
remove discuss link from the book
2015-01-23 13:53:19 -05:00
Steve Klabnik
dc2b3ac889
Remove lang items from the reference.
...
Fixes #19759
2015-01-23 12:15:34 -05:00
Steve Klabnik
aca793966a
Soup up 'method syntax' chapter of the Book
...
Fixes #16969
2015-01-23 11:04:55 -05:00
bors
e9285f9e81
Auto merge of #21374 - dgrunwald:range-notation-fixes, r=nikomatsakis
...
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-23 06:53:09 +00:00
Brian Anderson
761efa5e8c
Remove section on stability levels from reference
...
Obsolete, no replacement. The mechanics here are mostly implementation details at this point.
2015-01-22 16:38:58 -08:00
Steve Klabnik
ea6dc180fe
remove weird sentence
...
Fixes #21531
2015-01-22 18:59:33 -05:00
Steve Klabnik
9fb672b094
Rollup merge of #21517 - SeanTAllen:master, r=steveklabnik
...
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-22 18:10:01 -05:00
Steve Klabnik
aa874abc0d
Rollup merge of #21479 - steveklabnik:rustdoc_to_book, r=alexcrichton
...
Fixes #21430
2015-01-22 18:09:59 -05:00
Steve Klabnik
1644978616
Rollup merge of #21450 - alfie:book2, r=steveklabnik
...
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-22 18:09:58 -05:00
Steve Klabnik
5f71c22d87
Rollup merge of #21373 - angst7:pointer_doc_1, r=steveklabnik
...
Updated incorrect error messages, and removed explicit return statements from example code.
2015-01-22 18:09:58 -05:00
Steve Klabnik
c76ce8c36c
Rollup merge of #21091 - steveklabnik:add_attribute_docs, r=huonw
...
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-22 18:09:57 -05:00
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
4a6af11c34
Document remaining attributes and macros
...
Fixes #6444
2015-01-22 18:05:15 -05:00
Daniel Grunwald
db013f9f45
Fix some grammar inconsistencies for the '..' range notation.
...
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-22 19:55:15 +01: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
Sean T Allen
42cbd7a9bd
Reference correct fn during lifetime ellision
2015-01-22 13:17:23 -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
Steve Klabnik
23da54d894
Move rustdoc.md into the book
...
Fixes #21430
2015-01-21 14:59:25 -05:00
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