Skip to content

Rollup of 20 pull requests #27209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 53 commits into from
Closed

Rollup of 20 pull requests #27209

Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
fc16c3e
Improve the expected constant integer error message
jawline Jul 4, 2015
3a009cb
Merge branch 'master' of https://github.com/mmjack/rust
jawline Jul 4, 2015
f395b2b
Make the message slightly clearer
jawline Jul 4, 2015
8c5ffd3
Reduce line length
jawline Jul 4, 2015
02dd732
Self.sess -> txc.sess
jawline Jul 5, 2015
4872463
Remove 'valid' from error
jawline Jul 5, 2015
affbc72
Modified to add 'found' to error message instead
jawline Jul 19, 2015
b684826
add test for #20162
apasel422 Jul 19, 2015
871ccfb
Add a test for #26468
dotdash Jul 20, 2015
9bb6545
add test for #14229
apasel422 Jul 20, 2015
4c73dbd
add test for #19404
apasel422 Jul 20, 2015
31a62d3
s/has gained/has not gained/g
pfalabella Jul 20, 2015
a7e5c63
add test for #10436
apasel422 Jul 20, 2015
3ae7b72
Fix wording nit for E0253
AlisdairO Jul 20, 2015
27fc0f2
Document iterators in std::io
steveklabnik Jul 20, 2015
686d326
Add diagnostics for E0172, fix inline error message for E0139
AlisdairO Jul 19, 2015
7e7ec6b
Document structures in std::io::utils
steveklabnik Jul 20, 2015
9e18326
Update docs for take and broadcast
steveklabnik Jul 20, 2015
a29c834
Add travis config to TRPL: release channels
steveklabnik Jul 21, 2015
0eb7303
Add E0403 error explanation
GuillaumeGomez Jul 17, 2015
cd385cb
Add E0405 error explanation
GuillaumeGomez Jul 17, 2015
bc79f20
Add E0404 error explanation
GuillaumeGomez Jul 17, 2015
9581154
Add E0407 error explanation
GuillaumeGomez Jul 17, 2015
c13295b
Add E0428 error explanation
GuillaumeGomez Jul 17, 2015
d2aee95
Expand documentation for IntoInnerError
steveklabnik Jul 20, 2015
94b8f28
Improve documentation for std::io::LineWriter
steveklabnik Jul 20, 2015
2e919b4
Add E0433 error explanation
GuillaumeGomez Jul 17, 2015
e6d8434
add test for #14382
apasel422 Jul 20, 2015
a5c7b96
Add info about usage of 'unsafe' keyword in bindings to foreign inter…
Jul 21, 2015
48870d4
rust -> Rust
Jul 21, 2015
cf1e078
Klabnik nit-picks ;)
ticki Jul 21, 2015
18f115c
update compile-fail test for #21174 to account for #27127
apasel422 Jul 21, 2015
e22c6f7
Improve documentation for std::io::BufWriter
steveklabnik Jul 20, 2015
08f9001
Rollup merge of #26778 - jawline:master, r=pnkfelix
steveklabnik Jul 22, 2015
e6b5c96
Rollup merge of #27084 - GuillaumeGomez:patch-2, r=brson
steveklabnik Jul 22, 2015
9e11d4f
Rollup merge of #27127 - AlisdairO:diagnostics172, r=Manishearth
steveklabnik Jul 22, 2015
a7590e3
Rollup merge of #27131 - apasel422:issue-20162, r=arielb1
steveklabnik Jul 22, 2015
4c66f1a
Rollup merge of #27140 - dotdash:test-26468, r=luqmana
steveklabnik Jul 22, 2015
7d5587a
Rollup merge of #27146 - apasel422:issue-14229, r=alexcrichton
steveklabnik Jul 22, 2015
760365d
Rollup merge of #27147 - apasel422:issue-19404, r=alexcrichton
steveklabnik Jul 22, 2015
c7f1ae5
Rollup merge of #27151 - pfalabella:patch-2, r=steveklabnik
steveklabnik Jul 22, 2015
3d9a966
Rollup merge of #27154 - apasel422:issue-10436, r=Gankro
steveklabnik Jul 22, 2015
4ee25be
Rollup merge of #27155 - steveklabnik:doc_std_io_buf_writer, r=alexcr…
steveklabnik Jul 22, 2015
f3bffc4
Rollup merge of #27156 - AlisdairO:diagnostics253, r=Manishearth
steveklabnik Jul 22, 2015
d02c001
Rollup merge of #27157 - steveklabnik:doc_std_io_iterators, r=alexcri…
steveklabnik Jul 22, 2015
ac241dd
Rollup merge of #27158 - apasel422:issue-14382, r=alexcrichton
steveklabnik Jul 22, 2015
2af8ea2
Rollup merge of #27164 - steveklabnik:doc_io_utils, r=alexcrichton
steveklabnik Jul 22, 2015
3fc7be4
Rollup merge of #27166 - steveklabnik:doc_std_io_linewriter, r=alexcr…
steveklabnik Jul 22, 2015
18e0146
Rollup merge of #27167 - steveklabnik:doc_std_io_take, r=alexcrichton
steveklabnik Jul 22, 2015
4ac5308
Rollup merge of #27170 - steveklabnik:doc_std_io_intoinnererror, r=al…
steveklabnik Jul 22, 2015
9b98166
Rollup merge of #27175 - steveklabnik:channels_plus_travis, r=alexcri…
steveklabnik Jul 22, 2015
c38024d
Rollup merge of #27201 - Ticki:master, r=steveklabnik
steveklabnik Jul 22, 2015
9c8a0d9
Rollup merge of #27202 - apasel422:issue-21174, r=alexcrichton
steveklabnik Jul 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/mmjack/rust 
Conflicts:
	src/librustc/middle/ty.rs
  • Loading branch information
@jawline
jawline committed Jul 4, 2015
commit 3a009cb6cb15ceddffc7b1c37c6680b899f78742
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.