38844 Commits

Author SHA1 Message Date
Manish Goregaokar
9fe2d212a0 Rollup merge of #22634 - shepmaster:std-io-typo, r=Manishearth 2015-02-22 01:50:32 +05:30
Manish Goregaokar
dcbf226518 Rollup merge of #22633 - wesleywiser:fix_22586, r=sfackler
AtomicOption was removed in 7d8d06f86b48520814596bd5363d2b82bc619774
but the docs weren't updated.

Fixes #22586
2015-02-22 01:50:22 +05:30
Manish Goregaokar
b53e510297 Rollup merge of #22627 - ddfreyne:patch-1, r=dotdash 2015-02-22 01:50:08 +05:30
Manish Goregaokar
a9570e5549 Rollup merge of #22625 - inrustwetrust:dispatch-doc-grammar, r=huonw
As far as I could tell from discussions in other docs pull requests, American spelling is preferred for the docs?
2015-02-22 01:49:46 +05:30
Manish Goregaokar
e15d016146 Rollup merge of #22620 - edwardw:issue-22356, r=brson
PR #22436 has fixed it.

Closes #22356
2015-02-22 01:49:30 +05:30
Manish Goregaokar
ffe348561e Rollup merge of #22616 - caspark:fix-typo-in-deprecation-msg, r=alexcrichton
Essentially `s/fucntion/function/g` in `src/libstd/thread.rs`.
2015-02-22 01:49:08 +05:30
Manish Goregaokar
c90e854ec9 Rollup merge of #22614 - nick29581:fix-cc-crate, r=alexcrichton
... the post-analysis callback. We can also pass this to post-write-deps callback.

This fixes a really minor bug, which is basically about argument naming.

r? @alexcrichton
2015-02-22 01:48:54 +05:30
Manish Goregaokar
9fd45514b6 Rollup merge of #22578 - nagisa:deprecated-fallout, r=alexcrichton
Fixes #22575
Fixes #22618
2015-02-22 01:48:30 +05:30
Manish Goregaokar
e1c2f77754 Rollup merge of #22571 - nagisa:style-fallout, r=alexcrichton
Links in docblock headers also became blue, which was not intended.

r? @steveklabnik
2015-02-22 01:48:18 +05:30
Manish Goregaokar
2b8160bbd5 Rollup merge of #22562 - dckc:patch-4, r=Aatch
the punch line was cut off!

p.s. I wonder if I should have updated the copyright date too.
2015-02-22 01:48:01 +05:30
Manish Goregaokar
b7487db482 Rollup merge of #22545 - Ryman:fucntion, r=dotdash 2015-02-22 01:47:41 +05:30
Manish Goregaokar
f308550c16 Rollup merge of #22527 - dotdash:if-loop, r=huonw
In `if loop {} {}`, the `if` is actually unreachable, but we didn't
handle that correctly and when trying to translate the `if` we tried to
branch on the \"return value\" of the loop expression, which is not an
`i1` and therefore triggered an LLVM assertion.
2015-02-22 01:47:28 +05:30
Manish Goregaokar
b7ac60a2f1 Rollup merge of #22524 - stevencrockett:master, r=steveklabnik
The text is referring to the io module despite the code using the old_io module.
2015-02-22 01:47:14 +05:30
Manish Goregaokar
2e0609a8ad Rollup merge of #22522 - zeroem:patch-1, r=pnkfelix
Replaces the markdown link delimiters for the \"Code of Conduct\" link with the appropriate delimiters for using a link id

r? @steveklabnik
2015-02-22 01:47:02 +05:30
Manish Goregaokar
9d650ae723 Rollup merge of #22515 - adamhjk:add-else-if-to-docs, r=steveklabnik
Adds an example of `else if` to the If section of The Rust Programming
Language.

r? @steveklabnik
2015-02-22 01:46:42 +05:30
Manish Goregaokar
2bb8b95cd8 Rollup merge of #22509 - tshepang:not-needed-mut, r=steveklabnik 2015-02-22 01:46:27 +05:30
Manish Goregaokar
11c70a3b09 Rollup merge of #22267 - steveklabnik:fix_lie, r=Gankro
Otherwise, this line is a lie.
2015-02-22 01:46:03 +05:30
Jake Goulding
5b64845e47 Fix typo in std::io unstable reason 2015-02-21 11:56:58 -05:00
Wesley Wiser
7e533a972c Remove mention of non-existing AtomicOption in docs
AtomicOption was removed in 7d8d06f86b48520814596bd5363d2b82bc619774
but the docs weren't updated.

Fixes #22586
2015-02-21 11:51:06 -05:00
Denis Defreyne
a3aaaca088 Fix frow_raw/from_raw typo 2015-02-21 13:14:17 +01:00
inrustwetrust
1b20767460 Minor grammar/spelling fixes to the "Static and Dynamic Dispatch" doc 2015-02-21 11:50:25 +01:00
bors
2b01a37ec3 Auto merge of #21959 - dhuseby:bitrig-support, r=brson
This patch adds the necessary pieces to support rust on Bitrig https://bitrig.org
2015-02-21 09:20:48 +00:00
Edward Wang
0d218fd824 Add test for #22356
PR #22436 has fixed it.

Closes #22356
2015-02-21 14:37:30 +08:00
Caspar Krieger
60dee4bfc7 Fix typo in deprecation msg 2015-02-21 14:57:20 +11:00
Nick Cameron
712a6870e9 In the rustc driver, we pass the expanded, not the pre-expansion, AST to the post-analysis callback. We can also pass this to post-write-deps callback. 2015-02-21 16:25:51 +13:00
Tshepang Lekhonkhobe
fd2fdbded1 fix a few 'variable does not need to be mutable' warnings 2015-02-20 22:56:32 +02:00
Simonas Kazlauskas
d99af375d3 Escape some rustdoc strings 2015-02-20 15:59:51 +02:00
Simonas Kazlauskas
888dac97c7 Fix style fallout from 204e2bd442
Links in docblock headers also became blue, which was not intended.
2015-02-20 13:54:11 +02:00
Dan Connolly
72316c349e fix markup of "just one effect, unsafe"
the punch line was cut off!
2015-02-19 23:35:33 -06:00
Kevin Butler
6172986cc9 typo: fucntion -> function 2015-02-19 19:22:31 +00:00
bors
522d09dfec Auto merge of #22541 - Manishearth:rollup, r=Gankro
Continued from #22520
2015-02-19 18:36:59 +00:00
Manish Goregaokar
49771bafa5 Round 8 tex fixes 2015-02-19 23:18:20 +05:30
Alex Crichton
163be7525a Merge remote-tracking branch 'origin/master' into rollup 2015-02-19 07:03:43 -08:00
Alex Crichton
0cd54b85ef Round 5 test fixes and rebase conflicts 2015-02-19 07:03:18 -08:00
bors
0b664bb843 Auto merge of #22517 - brson:relnotes, r=Gankro
p=1 please
2015-02-19 10:54:08 +00:00
Björn Steinbrink
07c0faa407 Fix an ICE when translating if loop {} {}
In `if loop {} {}`, the `if` is actually unreachable, but we didn't
handle that correctly and when trying to translate the `if` we tried to
branch on the "return value" of the loop expression, which is not an
`i1` and therefore triggered an LLVM assertion.
2015-02-19 11:46:47 +01:00
bors
149f002437 Auto merge of #22497 - nikomatsakis:suffixes, r=alexcrichton
The old suffixes now issue warnings unless a feature-gate is given.

Fixes #22496.

r? @alexcrichton
2015-02-19 07:59:27 +00:00
Steven Crockett
e0067f9852 docs: correct guessing game to mention old_io module instead of io
The text is referring to the io module despite the code using the old_io module.
2015-02-19 05:13:49 +00:00
Darrell Hamilton
a6b47c0efa Fixes "Code of Conduct" Link
Replaces the markdown link delimiters for the "Code of Conduct" link with the appropriate delimiters for using a link id

r? @steveklabnik
2015-02-18 20:53:00 -07:00
Alex Crichton
cb29c468f3 Fix from niko for cfail tests 2015-02-18 18:01:03 -08:00
Alex Crichton
b8d35deda3 rollup merge of #22517: brson/relnotes
p=1 please
2015-02-18 17:58:01 -08:00
Alex Crichton
b7c0813eb7 Round 4 test fixes and rebase conflicts 2015-02-18 17:57:35 -08:00
Brian Anderson
c4bb064b3a Update AUTHORS.txt and RELEASES.md 2015-02-18 17:02:34 -08:00
Niko Matsakis
63f51ee90c Exempt phantom fns from the object safety check 2015-02-18 16:38:17 -08:00
Alex Crichton
d6e939a2df Round 3 test fixes and conflicts 2015-02-18 16:34:04 -08:00
Adam Jacob
cec404a066 Add documentation for else if to trpl
Adds an example of `else if` to the If section of The Rust Programming
Language.

r? @steveklabnik
2015-02-18 16:26:39 -08:00
bors
22992358bc Auto merge of #22436 - nikomatsakis:issue-22246-bound-lifetimes-of-assoc-types, r=nikomatsakis
Take 2. This PR includes a bunch of refactoring that was part of an experimental branch implementing [implied bounds]. That particular idea isn't ready to go yet, but the refactoring proved useful for fixing #22246. The implied bounds branch also exposed #22110 so a simple fix for that is included here. I still think some more refactoring would be a good idea here -- in particular I think most of the code in wf.rs is kind of duplicating the logic in implicator and should go, but I decided to post this PR and call it a day before diving into that. I'll write a bit more details about the solutions I adopted in the various bugs. I patched the two issues I was concerned about, which was the handling of supertraits and HRTB (the latter turned out to be fine, so I added a comment explaining why.)

r? @pnkfelix (for now, anyway)
cc @aturon 

[implied bounds]: http://smallcultfollowing.com/babysteps/blog/2014/07/06/implied-bounds/
2015-02-18 23:58:38 +00:00
Alex Crichton
1506b34e0c rollup merge of #22286: nikomatsakis/variance-4b
Conflicts:
	src/librustc/middle/infer/combine.rs
	src/librustc_typeck/check/wf.rs
2015-02-18 15:52:01 -08:00
Alex Crichton
3e7a04cb3c Round 2 test fixes and conflicts 2015-02-18 15:48:45 -08:00
Alex Crichton
231eeaa35b rollup merge of #22502: nikomatsakis/deprecate-bracket-bracket
Conflicts:
	src/libcollections/slice.rs
	src/libcollections/str.rs
	src/librustc/middle/lang_items.rs
	src/librustc_back/rpath.rs
	src/librustc_typeck/check/regionck.rs
	src/libstd/ffi/os_str.rs
	src/libsyntax/diagnostic.rs
	src/libsyntax/parse/parser.rs
	src/libsyntax/util/interner.rs
	src/test/run-pass/regions-refcell.rs
2015-02-18 15:48:40 -08:00