Skip to content

Rollup some PRs in the queue #22367

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.

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

Merged
merged 96 commits into from
Feb 16, 2015
Merged
Changes from 2 commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
995b159
rustdoc: Show must_use attribute
sanxiyn Feb 12, 2015
00a6ff9
Adjusting default CPUs for iOS
vhbit Feb 12, 2015
3df5c4a
Update LLVM to disable asserts in the PassInfo cache
dotdash Feb 12, 2015
9c686dc
Correct typo for 'underyling'
duaneedwards Feb 12, 2015
e4a9eb9
Remove `_VALUE` from the float extremes constants.
huonw Feb 13, 2015
be440bc
Upgrade rust-installer
brson Feb 11, 2015
b2f70a4
Update uninstall instructions
brson Feb 13, 2015
8dcc886
Change README quick start instructions to defer entirely to the book.
brson Feb 13, 2015
9df38bf
Remove some irrelevant text from README
brson Feb 13, 2015
b4a2861
Rename the "unsafe" lang item to "unsafe_cell"
lambda-fairy Feb 13, 2015
aef5551
Rename `unsafe_lang_item` to `unsafe_cell_lang_item`
lambda-fairy Feb 13, 2015
c5dba72
Remove reference to mailing list
iKevinY Feb 13, 2015
f28a333
Make if after colon lowercase
fhahn Feb 13, 2015
ce22f30
Make note of doc duplication with reexports
steveklabnik Feb 10, 2015
805a31f
Improve documentation for `Select::new()`.
steveklabnik Feb 13, 2015
4b25d75
Remove outdated information about copy/move from the reference
steveklabnik Feb 13, 2015
58a7d58
Re-word paragraph about enums and equality
steveklabnik Feb 13, 2015
114301f
Refer to LLVM rather than GCC wiki for atomic orderings
steveklabnik Feb 13, 2015
d414a39
Re-tag `slicing_syntax` as `Accepted`.
pnkfelix Feb 13, 2015
65eab6e
Add diverging functions to the book.
steveklabnik Feb 13, 2015
a7d5c3f
Added all active features to the list in reference.md.
pnkfelix Feb 13, 2015
fb05f28
Add `#[rustc_error]` annotation, which causes trans to signal an error
nikomatsakis Feb 12, 2015
f48eda8
Fix small copy-paste typo
unode Feb 13, 2015
e478f66
Don't specify tuple layout.
steveklabnik Feb 13, 2015
9eb4436
Add link to module-level Option documentation.
steveklabnik Feb 13, 2015
be97aab
Update version number for 1.0.0-alpha.2
brson Feb 13, 2015
6647d83
Mention type placeholders in the book.
steveklabnik Feb 13, 2015
ece19bf
Enhance static mut example in FFI chapter.
steveklabnik Feb 13, 2015
5284c4e
Remove a few uses of deprecated getenv
nagisa Feb 13, 2015
220bf41
Cleanup getenv from tests and benchmarks
nagisa Feb 13, 2015
b19fda0
Remove ExactSizeIterator from 64-bit ranges.
Feb 13, 2015
228603d
Parse `pub` in the expansion of a method macro
kmcallister Feb 13, 2015
dcd4cef
Forbid `pub mymacro!();`
kmcallister Feb 13, 2015
effad62
Add the build date to the reported version. #21957
brson Feb 12, 2015
3df8245
add test for #21909
Feb 13, 2015
148d90b
clarfiy reference with regards to the value of block expressions
steveklabnik Feb 13, 2015
f64d912
Generate grammar.html and link to it from the reference.
steveklabnik Feb 13, 2015
6d2e3d4
Note that Vec<T> is heap allocated.
steveklabnik Feb 13, 2015
5e3ae10
Dramatically expand the docs of std::raw.
huonw Feb 12, 2015
7a52932
Make std::raw::Repr an unsafe trait
Feb 13, 2015
1c49404
allow DList to split_at . fixes #22244
Gankra Feb 12, 2015
1e01f7f
Rename std::failure to std::panicking
iKevinY Feb 14, 2015
10dd8e7
we forgot to make `Path` implement `Hash`
blaenk Feb 14, 2015
657081b
Normalize range syntax used in concurrency.md
Manishearth Feb 14, 2015
af7b891
Correct typo
shepmaster Feb 14, 2015
f658efe
Documentation Fixes
Feb 14, 2015
09f53fd
Audit integer types in libunicode, libcore/(char, str) and libstd/ascii
petrochenkov Feb 14, 2015
b1cd769
Fix the fallout
petrochenkov Feb 14, 2015
8f5d698
core::raw: uint -> usize
brson Feb 14, 2015
438e527
core: Use int/isize in Clone boilerplate
brson Feb 14, 2015
1a99315
Fix issue with generation
steveklabnik Feb 15, 2015
e72fb35
core::slice: uint -> usize, int -> isize
brson Feb 15, 2015
b13fddd
Rollup merge of #22132 - steveklabnik:gh16645, r=alexcrichton
Manishearth Feb 15, 2015
63091ef
Rollup merge of #22201 - brson:version, r=nick29581
Manishearth Feb 15, 2015
8cc3fbd
Rollup merge of #22218 - huonw:raw-docs, r=steveklabnik,huonw
Manishearth Feb 15, 2015
132b56c
Rollup merge of #22224 - sanxiyn:must-use, r=cmr
Manishearth Feb 15, 2015
8623fe7
Rollup merge of #22229 - vhbit:ios-default-cpus, r=alexcrichton
Manishearth Feb 15, 2015
e6ad384
Rollup merge of #22238 - dotdash:llvmup_20150212, r=alexcrichton
Manishearth Feb 15, 2015
d014548
Rollup merge of #22248 - duaneedwards:patch-1, r=Gankro
Manishearth Feb 15, 2015
da1a1f5
Rollup merge of #22254 - huonw:float-value--, r=aturon
Manishearth Feb 15, 2015
8ebbf58
Rollup merge of #22262 - lfairy:unsafe-cell-lang-item, r=alexcrichton
Manishearth Feb 15, 2015
f6fa27a
Rollup merge of #22263 - iKevinY:no-mailing-list, r=nikomatsakis
Manishearth Feb 15, 2015
cff0b78
Rollup merge of #22264 - fhahn:tiny-doc-fix2, r=Gankro
Manishearth Feb 15, 2015
a2bc3a2
Rollup merge of #22268 - steveklabnik:improve_wait, r=nikomatsakis
Manishearth Feb 15, 2015
3fe2715
Rollup merge of #22269 - steveklabnik:gh22136, r=alexcrichton
Manishearth Feb 15, 2015
ed9ffce
Rollup merge of #22271 - steveklabnik:gh22035, r=nikomatsakis
Manishearth Feb 15, 2015
828a864
Rollup merge of #22272 - steveklabnik:gh22064, r=alexcrichton
Manishearth Feb 15, 2015
33371bf
Rollup merge of #22274 - pnkfelix:retag-slicing-syntax-as-accepted, r…
Manishearth Feb 15, 2015
f96fb8e
Rollup merge of #22275 - steveklabnik:gh7538, r=huonw
Manishearth Feb 15, 2015
2935d67
Rollup merge of #22277 - pnkfelix:reference-update-feature-gate-list,…
Manishearth Feb 15, 2015
a2840f3
Rollup merge of #22278 - nikomatsakis:rustc-error, r=nikomatsakis
Manishearth Feb 15, 2015
1ee09f9
Rollup merge of #22280 - Unode:patch-1, r=steveklabnik
Manishearth Feb 15, 2015
1718e6b
Rollup merge of #22284 - steveklabnik:fix_another_lie, r=nikomatsakis
Manishearth Feb 15, 2015
db4a167
Rollup merge of #22288 - steveklabnik:add_option_link, r=nikomatsakis
Manishearth Feb 15, 2015
0f66e31
Rollup merge of #22295 - steveklabnik:gh9980, r=alexcrichton
Manishearth Feb 15, 2015
1b86ebe
Rollup merge of #22299 - bluss:range-64-is-not-exact-size, r=alexcric…
Manishearth Feb 15, 2015
1da4e53
Rollup merge of #22302 - japaric:gh21909, r=brson
Manishearth Feb 15, 2015
70647ec
Rollup merge of #22305 - steveklabnik:gh20948, r=alexcrichton
Manishearth Feb 15, 2015
cb09001
Rollup merge of #22307 - steveklabnik:gh14849, r=huonw
Manishearth Feb 15, 2015
6ce265e
Rollup merge of #22308 - steveklabnik:gh19278, r=brson
Manishearth Feb 15, 2015
a001998
Rollup merge of #22324 - Manishearth:patch-1, r=steveklabnik
Manishearth Feb 15, 2015
c6ced0f
Rollup merge of #22328 - shepmaster:os_str_typo, r=steveklabnik
Manishearth Feb 15, 2015
a5bdb08
Rollup merge of #22329 - thiagooak:book, r=steveklabnik
Manishearth Feb 15, 2015
e5659ea
Rollup merge of #22347 - iKevinY:std-lib-panicking, r=brson
Manishearth Feb 15, 2015
c59f62b
Rollup merge of #22350 - brson:usize, r=Gankro
Manishearth Feb 15, 2015
8acaaa9
Rollup merge of #22351 - blaenk:path-hash, r=huonw
Manishearth Feb 15, 2015
f7870b6
Rollup merge of #22339 - petrochenkov:int, r=huonw
Manishearth Feb 15, 2015
bc1900f
Rollup merge of #22300 - kmcallister:pub-method-macro, r=sfackler
Manishearth Feb 15, 2015
ed58399
Rollup merge of #22297 - nagisa:spring-cleanup, r=alexcrichton
Manishearth Feb 15, 2015
8111d65
Rollup merge of #22293 - steveklabnik:gh12891, r=brson
Manishearth Feb 15, 2015
ed728ec
Rollup merge of #22292 - brson:alpha2, r=alexcrichton
Manishearth Feb 15, 2015
16b24f1
Rollup merge of #22285 - kmcallister:pub-macro, r=nick29581
Manishearth Feb 15, 2015
97503e1
Rollup merge of #22256 - brson:installer-next, r=alexcrichton
Manishearth Feb 15, 2015
b1a46db
Rollup merge of #22247 - Gankro:dlist_split, r=alexcrichton
Manishearth Feb 15, 2015
f0f8be2
Fix rollup (remove slicing_syntax)
Manishearth Feb 15, 2015
cea2bbf
Fix grammar
Manishearth Feb 15, 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
12 changes: 6 additions & 6 deletions src/doc/trpl/concurrency.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ use std::time::Duration;
fn main() {
let mut data = vec![1u32, 2, 3];

for i in 0 .. 2 {
for i in 0..2 {
Thread::spawn(move || {
data[i] += 1;
});
Expand Down Expand Up @@ -211,7 +211,7 @@ use std::sync::Mutex;
fn main() {
let mut data = Mutex::new(vec![1u32, 2, 3]);

for i in 0 .. 2 {
for i in 0..2 {
let data = data.lock().unwrap();
Thread::spawn(move || {
data[i] += 1;
Expand Down Expand Up @@ -262,7 +262,7 @@ use std::time::Duration;
fn main() {
let data = Arc::new(Mutex::new(vec![1u32, 2, 3]));

for i in (0us..2) {
for i in 0us..2 {
let data = data.clone();
Thread::spawn(move || {
let mut data = data.lock().unwrap();
Expand All @@ -285,7 +285,7 @@ thread more closely:
# use std::time::Duration;
# fn main() {
# let data = Arc::new(Mutex::new(vec![1u32, 2, 3]));
# for i in (0us..2) {
# for i in 0us..2 {
# let data = data.clone();
Thread::spawn(move || {
let mut data = data.lock().unwrap();
Expand Down Expand Up @@ -323,7 +323,7 @@ fn main() {

let (tx, rx) = mpsc::channel();

for _ in (0..10) {
for _ in 0..10 {
let (data, tx) = (data.clone(), tx.clone());

Thread::spawn(move || {
Expand All @@ -334,7 +334,7 @@ fn main() {
});
}

for _ in 0 .. 10 {
for _ in 0..10 {
rx.recv();
}
}
Expand Down