Rollup of 12 pull requests #25218
Merged
Rollup of 12 pull requests #25218
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Manishearth
commented
May 8, 2015
Manishearth
commented
- Successful merges: fix logic when describing kinds of borrows #24864, Fix libstd build for mips / mipsel Linux #25140, Change rand version to '*' #25179, Fix incorrect curly quotes #25181, Add long diagnostics for E0046 and E0054 #25190, doc: the prevailing convention is to use assert_eq! when 2 values are… #25194, book: a few minor fixes #25195, Expand OS X versions referenced in configure message #25198, Fix sort in AUTHORS.txt #25203, fixed a mistake #25210, Add a reason to the libc & rand instability. #25211, Update method-syntax.md #25215
- Failed merges: Add long diagnostics for E0062, E0063 and E0137 #25200
PR rust-lang#24611 added these for other architectures, but missed the `#[cfg(any(target_arch = "mips", target_arch = "mipsel"))]` version of the module. The values are the same.
Following paragraph says "we've used `*` which..." but code says "rand=\"0.3.0\""
changed paragraphs with discussion of Cargo.lock file to agree with rand version 0.3.0 in the Cargo.tom file.
Didn't realise 0.3.0 referred to all 0.3.x versions! Fixed my mistakes. Should have just updated the Cargo.toml now.
Now that `std::old_io` has been removed for quite some time the naming real estate here has opened up to allow these modules to move back to their proper names.
This module has been removed for quite some time!
Perform unsafe initialization up front and then only afterward the mutex is in place do we initialize it.
10.10 is out, so it's weird to see a message that says you're on 10.9. Change the message to be >=10.9.
* Remove the 2-suffix from some modules * Remove some unused files * Remove double-boxing for `ReentrantMutex`
If you have 0 references (`&T`) to a resource, presumably, you could have a mutable reference (`&mut T`). So this only start to make sense at having 1 reference to a resource.
Properly sorted, Ł goes between L and M.
Many many many people ask in #rust about this libraries, having an explanatory reason will probably help a lot.
If you have 0 references (`&T`) to a resource, presumably, you could have a mutable reference (`&mut T`). So this only start to make sense at having 1 reference to a resource.
Building with `--target=mipsel-unknown-linux-gnu` currently results in the following errors, fixed by this PR:
```
rustc: x86_64-unknown-linux-gnu/stage2/lib/rustlib/mipsel-unknown-linux-gnu/lib/libstd
/vol/rust/src/libstd/os/linux/raw.rs:76:21: 76:28 error: use of undeclared type name `c_ulong`
/vol/rust/src/libstd/os/linux/raw.rs:76 pub st_dev: c_ulong,
^~~~~~~
/vol/rust/src/libstd/os/linux/raw.rs:83:22: 83:29 error: use of undeclared type name `c_ulong`
/vol/rust/src/libstd/os/linux/raw.rs:83 pub st_rdev: c_ulong,
^~~~~~~
/vol/rust/src/libstd/sys/common/net2.rs:210:52: 210:70 error: unresolved name `libc::TCP_KEEPIDLE`
/vol/rust/src/libstd/sys/common/net2.rs:210 setsockopt(&self.inner, libc::IPPROTO_TCP, libc::TCP_KEEPIDLE,
```
Following paragraph says "we've used `*` which..." but code says "rand=\"0.3.0\""
…klabnik … compared
I deleted one unneccessary 'the' and added the href for [bindings]
… r=alexcrichton Tiny tiny nitpick that I just noticed after getting a new laptop ( 🍺 + 💻 = 👼 ) and thus needing to ./configure anew on Yosemite. It's weird to see a message that says you're on 10.9 if you're on 10.10, in a oh-i-wonder-what-else-is-wrong sort of sense-- easy fix with a `>=` since `gcc --version` on 10.10 with the newest xcode still says it's clang. ❤️
…chton Properly sorted, Ł goes between L and M.
fixed a doc mistake in libcore/marker.mk
Many many many people ask in #rust about this libraries, having an explanatory reason will probably help a lot.
Fix wrong radius valve from 0.0 to 1.0 as above
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=20 |
|
📌 Commit 55437b4 has been approved by |
|
\o/ |
This was referenced May 8, 2015
Merged
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.