Skip to content

Rollup of 26 pull requests - #40592

Closed
frewsxcv wants to merge 68 commits into
rust-lang:masterfrom
frewsxcv:rollup
Closed

Rollup of 26 pull requests#40592
frewsxcv wants to merge 68 commits into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

@frewsxcv

Copy link
Copy Markdown
Contributor

malbarboand others added 30 commits March 7, 2017 10:17
As of last year with version 'Sierra', the Mac operating system is now
called 'macOS'.
This was never established as a convention we should follow in the 'More
API Documentation Conventions' RFC:
https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md
Primarily opened to address the concerns brought up in
rust-lang#40498.
* run rustfmt on code blocks
* use `DefaultHasher` instead of deprecated `SipHasher`
* rename `hash` to `calculate_hash` to prevent confusion with the `hash`
method
We don't want a dynamic dependency in the library that we ship, so link it
statically by configuring curl-sys's build script to not pick up the system
version via pkg-config.
Whenever we parse a chain of binary operations, as long as the first
operation is `<` and the subsequent operations are either `>` or `<`,
present the following diagnostic help:
use `::<...>` instead of `<...>` if you meant to specify type arguments
This will lead to spurious recommendations on situations like
`2 < 3 < 4` but should be clear from context that the help doesn't apply
in that case.
…sfackler
std: remove a workaround for privacy limitations
`std::thread::Thread` implements a non-exported `NewThread` trait to allow for internal-only use of `Thread::new`. Nowadays we have `pub(crate)`, which accomplishes the same thing but much more idiomatically.
Rustdoc handles this correctly (I checked and I didn't see `Thread::new` on the rustdoc entry for `Thread` with this change), and the stage1 `rustc` emits the correct error still (I'm assuming that the stage1 compiler uses my `libstd`?):
```
$ ./build/x86_64-apple-darwin/stage1/bin/rustc test.rs
error: method `new` is private
--> test.rs:4:18
|
4 | let thread = thread::Thread::new(None);
| ^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error
```
A few improvements to the `core::hash` top-level docs.
Primarily opened to address the concerns brought up in
rust-lang#40498.
* run rustfmt on code blocks
* use `DefaultHasher` instead of deprecated `SipHasher`
* rename `hash` to `calculate_hash` to prevent confusion with the `hash`
method
travis: Ensure cargo links libcurl statically
We don't want a dynamic dependency in the library that we ship, so link it
statically by configuring curl-sys's build script to not pick up the system
version via pkg-config.
.gitmodules: use official URLs w/o redirect
…, r=steveklabnik
Fix documentation for Vec::dedup_by.
The previous docstring was copied from dedup_by_key.
Library stabilizations for 1.17
Details of the stabilizations are available in the commits. Includes only library stabilizations; there are a couple of compiler stabilizations that should also be done for 1.17.
Will need a beta backport, which I will create after approval.
r? @alexcrichton
…ichton
Removes Default for Box<Path>.
This was not supposed to be added. cc @alexcrichton
…, r=nikomatsakis
rustbuild: Retry downloads of OpenSSL source
We need this to compile Cargo and we download it at build time, but as like all
other network requests it has a chance of failing. This commit moves the source
of the tarball to a mirror (S3 seems semi-more-reliable most of the time) and
also wraps the download in a retry loop.
cc rust-lang#40474
…nstable-book, r=frewsxcv
add sort_unstable to unstable book
cc rust-lang#40585
@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @sfackler (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10

@bors

bors commented Mar 17, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit ee03f19 has been approved by frewsxcv

@bors

bors commented Mar 17, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ee03f19 with merge 34b2105...

@bors

bors commented Mar 17, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors retry

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r-

Oh that looks like a legitimate error:

error[E0308]: mismatched types
--> /checkout/src/libstd/sys_common/net.rs:342:55
|
342 | cvt(unsafe { c::bind(*sock.as_inner(), addrp, len) })?;
| ^^^ expected i32, found u32
error[E0308]: mismatched types
--> /checkout/src/libstd/sys_common/net.rs:433:55
|
433 | cvt(unsafe { c::bind(*sock.as_inner(), addrp, len) })?;
| ^^^ expected i32, found u32
error[E0308]: mismatched types
--> /checkout/src/libstd/sys/unix/ext/net.rs:644:82
|
644 | cvt(libc::bind(*inner.as_inner(), &addr as *const _ as *const _, len))?;
| ^^^ expected i32, found u32
error[E0308]: mismatched types
--> /checkout/src/libstd/sys/unix/ext/net.rs:923:85
|
923 | cvt(libc::bind(*socket.0.as_inner(), &addr as *const _ as *const _, len))?;
| ^^^ expected i32, found u32
error: aborting due to 4 previous errors
error: Could not compile `std`.
To learn more, run the command again with --verbose.

@alexcrichton

Copy link
Copy Markdown
Member

(er didn't mean to close)

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

Oh I missed that. Maybe I was looking at the wrong machine. Probably that libc bump again.

@alexcrichton

Copy link
Copy Markdown
Member

(agreed to the cause)

@frewsxcvfrewsxcv mentioned this pull request Mar 17, 2017
@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

I'll open another rollup

@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@frewsxcv@rust-highfive@bors@alexcrichton@Centril@sfackler@malbarbo@tbu-@tshepang@projektir@llogiq@mattico@wesleywiser@swgillespie@nodakai@wagenet@steveklabnik@estebank@brson@aturon