Commit Graph

37456 Commits

Author SHA1 Message Date
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
22ed381ada Rollup merge of #21477 - steveklabnik:gh21440, r=alexcrichton
Fixes #21440"
2015-01-22 18:09:59 -05:00
Steve Klabnik
0b793ea619 Rollup merge of #21472 - steveklabnik:gh21469, r=huonw
Fixes #21469.
2015-01-22 18:09:59 -05:00
Steve Klabnik
07fb31a099 Rollup merge of #21471 - michaelwoerister:associated-types, r=alexcrichton
This should fix issue #20797 (but I don't want to close it automatically).
As the actual fix is very small this would be a perfect candidate for a rollup.
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
3364d41282 Rollup merge of #21325 - nagisa:thread-panicking, r=steveklabnik
Previous wording wasn’t clear about its actual behaviour. It could be
interpreted as answering either:

* Can current thread panic?
* Is current thread unwinding because of panic?

r? @steveklabnik
2015-01-22 18:09:58 -05:00
Steve Klabnik
4db64bd824 Rollup merge of #21217 - Gankro:docadoca, r=steveklabnik
Not sure on what *exactly* should be said here, but I think this is the most important bit. This PR also establishes conventions for describing performance minimally.

I suggest to describe preformance for individual methods we use a `# Performance` heading. Not sure if we should have 

```
# Performance: O(1)
details details
```
or

```
# Performance:
O(1)
details details
```

Since I think most methods don't need discussion, the former seems more resonable. But it's kind of weird to have info "in" the heading.

r? @steveklabnik
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
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
bors
b7930d93d9 Auto merge of #21187 - oli-obk:feature/hint_struct_field_access, r=alexcrichton
rebase and fix of #19267
2015-01-22 12:09:02 +00:00
bors
5d2056a7e3 Auto merge of #21473 - alexcrichton:rollup, r=alexcrichton 2015-01-22 06:12:46 +00:00
Alex Crichton
90af72378d Make diagnostic ordering deterministic 2015-01-21 20:25:19 -08:00
Alex Crichton
91cec5b57e Revert "Use assume to inform the optimiser about refcount invariants"
This reverts commit a729a40494.
2015-01-21 13:55:14 -08:00
Alex Crichton
e6f85c2f78 Revert "Add assumptions that the pointer is non-null"
This reverts commit 9bbfd681c9.
2015-01-21 13:55:11 -08:00
Alex Crichton
ee253c918d Revert "Add more explanation for why the assumes are there"
This reverts commit a7525bc4c8.
2015-01-21 13:55:04 -08:00
Alex Crichton
ecbee2e568 More test fixes and rebase conflicts 2015-01-21 12:49:02 -08: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
Steve Klabnik
bbbdd1086c Improve RwLock::new's docs
Fixes #21440"
2015-01-21 14:54:52 -05: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
Alex Crichton
036d8c4189 rollup merge of #21252: nikomatsakis/assoc-type-ice-hunt-take-2
Project region bounds out of the trait when deciding whether a projection type outlives a given regions.

Fixes #20890.
Fixes #21150.
2015-01-21 11:51:10 -08:00
Alex Crichton
f4df69a40a rollup merge of #20642: michaelwoerister/sane-source-locations-pt1
Conflicts:
	src/librustc_trans/trans/debuginfo.rs
2015-01-21 11:50:34 -08:00
Niko Matsakis
626db33bc8 Move regression test for #20971 into run-fail, since it panics. 2015-01-21 14:35:41 -05:00
Aaron Turon
537889aa78 Fix type inference problems in tests and docs 2015-01-21 11:16:00 -08:00
Alex Crichton
4ffde0814f Test fixes and rebase conflicts 2015-01-21 10:32:56 -08:00
Eduard Burtescu
2d17a33878 Deny imports after non-item statements. 2015-01-21 20:05:16 +02:00
Eduard Burtescu
5e07f5a792 Added another test with success local-item shadowing 2015-01-21 20:05:16 +02:00
Marvin Löbel
652445f714 Added some tests for arbitrary ordered view items 2015-01-21 20:05:16 +02:00
Eduard Burtescu
139346adb6 tests: fix fallout of merging ast::ViewItem into ast::Item. 2015-01-21 20:05:16 +02:00
Steve Klabnik
973c2f65ae Explain that RefCell is single-threaded.
Fixes #21469.
2015-01-21 12:43:34 -05:00
Michael Woerister
3a44107f9e debuginfo: Fix issue with associated types and struct fields 2015-01-21 18:25:53 +01:00
Alex Crichton
9c999c797c rollup merge of #21463: sanxiyn/demut 2015-01-21 09:21:09 -08:00
Alex Crichton
79708e6ac2 rollup merge of #21462: ahmedcharles/remove-ratchet
Conflicts:
	src/libtest/lib.rs
2015-01-21 09:21:06 -08:00
Alex Crichton
87c3ee861e rollup merge of #21457: alexcrichton/issue-21436
Conflicts:
	src/liballoc/boxed.rs
	src/librustc/middle/traits/error_reporting.rs
	src/libstd/sync/mpsc/mod.rs
2015-01-21 09:20:35 -08:00
Alex Crichton
e4b81d2512 rollup merge of #21447: cmr/master
Closes #13971
2015-01-21 09:19:03 -08:00
Alex Crichton
efea645c94 rollup merge of #21446: stepancheg/boxed-test
Conflicts:
	src/liballoc/boxed.rs
2015-01-21 09:18:56 -08:00
Alex Crichton
907db6c834 rollup merge of #21444: petrochenkov/null
Conflicts:
	src/libstd/sync/mpsc/select.rs
2015-01-21 09:18:07 -08:00
Alex Crichton
b5de8333b3 rollup merge of #21441: alexcrichton/rustc-opts
This is a bit of cleanup work to clean out some old deprecated flags and deprecated lint names from the compiler (they've been deprecated for quite awhile now).

This also notably puts `--pretty` behind the `-Z unstable-options` flag (where it was supposed to be previously).
2015-01-21 09:17:43 -08:00
Alex Crichton
27838075e0 rollup merge of #21438: taralx/kill-racycell
Conflicts:
	src/libstd/sync/mpsc/mod.rs
2015-01-21 09:17:40 -08:00
Alex Crichton
04a2255739 rollup merge of #21437: FlaPer87/snapshot
r? @alexcrichton
2015-01-21 09:16:40 -08:00
Alex Crichton
de89dc883e rollup merge of #21433: alfie/typobook
Tiny fix
2015-01-21 09:16:38 -08:00
Alex Crichton
28937be16a rollup merge of #21429: GuillaumeGomez/macro-fix
This is little clean code of this PR: #21366. I patched the same thing as aochagavia but too slowly obviously. This is a merge of our two codes, more "rust-like".
2015-01-21 09:16:37 -08:00
Alex Crichton
9ef5484783 rollup merge of #21423: oli-obk/prettier_read_until
Conflicts:
	src/libstd/io/mod.rs
2015-01-21 09:16:33 -08:00
Alex Crichton
bf77f6ca03 rollup merge of #21421: huonw/one-suggestion-per-trait
This is clearly useless, the user doesn't need to know that they could
implement/import `foo::bar::Baz` 4 times.

Fixes #21405.
2015-01-21 09:16:05 -08:00
Alex Crichton
e4e9a2771c rollup merge of #21419: Toby-S/patch-1
This just corrects a couple of typos in doc comments, and changes some to conform to the Rust guidelines.
2015-01-21 09:16:03 -08:00
Alex Crichton
229243c136 rollup merge of #21418: Aatch/assume-refcount
The reference count can never be 0, unless we're about to drop the data
completely. Using the `assume` intrinsic allows us to inform LLVM about
that invariant, meaning it can avoid unnecessary drops.

---

Before and after IR: https://gist.github.com/Aatch/3786d20df2edaad6a0e8

Generated from the example in #13018

Fixes #13018
2015-01-21 09:16:01 -08:00