Skip to content

Rollup of 26 pull requests - #57542

Merged
bors merged 73 commits into
rust-lang:masterfrom
Centril:rollup
Jan 12, 2019
Merged

Rollup of 26 pull requests#57542
bors merged 73 commits into
rust-lang:masterfrom
Centril:rollup

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

scottmcmand others added 30 commits December 1, 2018 16:35
Inspired by the recent conversation on IRLO.
Add @Centril's comment
Co-Authored-By: scottmcm <scottmcm@users.noreply.github.com>
CMake 3.4 and newer which is the required minimum version for LLVM
supports CMAKE_{C,CXX}_COMPILER_LAUNCHER for settting the compiler
launcher such as ccache which doesn't require shifting arguments.
Use fonts from the Roman 2.007 and Italic 1.007 version at:
https://github.com/adobe-fonts/source-serif-pro/releases/tag/2.007R-ro%2F1.007R-it
The following files are used from the distribution:
* WOFF/TTF/SourceSerifPro-Regular.ttf.woff
* WOFF/TTF/SourceSerifPro-Bold.ttf.woff
* WOFF/TTF/SourceSerifPro-It.ttf.woff
These replace the older Source Serif Pro regular and bold fonts, and
the Heuristica italic font.
Adding a map to TypeckTables to get the list of all the Upvars
given a closureID. This is help us get rid of the recurring
pattern in the codebase of iterating over the free vars
using with_freevars.
Change the key of UpvarListMap from DefId to ast::NodeId
…s usage.
Currently, there are many places in rustc, where we use
with_freevars to iterate over freevars of a closure. The
problem with this is the argument to with_freevars is a
NodeId and this will get in the way of our eventual goal
of solving for issue (rust-lang#53488), sub-issue (rust-lang#56905)
image-base could be used by crates like backtrace to providing to make
symbol resolution easier.
…r=alexcrichton
Use CMAKE_{C,CXX}_COMPILER_LAUNCHER for ccache
CMake 3.4 and newer which is the required minimum version for LLVM
supports CMAKE_{C,CXX}_COMPILER_LAUNCHER for settting the compiler
launcher such as ccache which doesn't require shifting arguments.
…llaumeGomez
Rustdoc: update Source Serif Pro and replace Heuristica italic
When Source Serif Pro was used to replace Heuristica in rust-lang#15530, the italic variant was not ready yet, but now it is. This PR updates the Source Serif Pro font files to the [latest release](https://github.com/adobe-fonts/source-serif-pro/releases/tag/2.007R-ro%2F1.007R-it) which includes an italic variant, and replaces Heuristica italic with Source Serif Pro italic.
Fixesrust-lang#57363.
…-parsing, r=GuillaumeGomez
rustdoc: use text-based doctest parsing if a macro is wrapping main
This is a "forward-port" of rust-lang#57019, intended to get rust-lang#56898 on nightly, since it's now fixed on beta (and already worked on stable).
To recap:
* The libsyntax-based doctest parsing now checks to see whether there is a top-level macro invocation in the doctest while it's checking for `fn main` and an `extern crate` statement.
* If it finds a macro invocation and *didn't* find `fn main`, then it performs the older text-based scan to allow doctests like the ones in `allocator_api` to still compile.
A "proper" fix will involve changing how `make_test` works to call it later in the `run_test` function, after the initial steps of compilation have completed. I've filed [a separate issue](rust-lang#57415) for that, though.
…, r=dtolnay
Add link destination for `read-ownership`
Resolvesrust-lang#56610.
…petrochenkov
Remove `CrateNum::Invalid`.
It's unused.
…ix-unknown-sgx-backtrace-support, r=alexcrichton
Supporting backtrace for x86_64-fortanix-unknown-sgx.
# Overview
Implementing following functions required by `libstd/sys_common` to support `backtrace`:
```
1. unwind_backtrace
2. trace_fn
3. resolve_symname
```
# Description:
The changes here are quite similar to the Cloudabi target `src/libstd/sys/cloudabi/backtrace.rs`
The first 2 functions are implemented via calls to libunwind.a that is linked to the `x86_64-fortanix-unknown-sgx` (rust-lang#56979), we have not implemented functionality needed by `resolve_symname` (or `dladdr`) to reduce SGX TCB. Rather, we print the function address (relative to enclave image base) in `resolve_symname` which can be later translated to correct symbol name (say, via `addr2line`).
# Note:
For `x86_64-fortanix-unknown-sgx`, the `RUST_BACKTRACE` environment has to be set from within the program running in an enclave.
cc: @jethrogb
r? @alexcrichton
…rochenkov
Reference tracking issue for inherent associated types in diagnostic
This makes it clearer that associated types in inherent impls are an intended feature, like the diagnostic for equality constraints in where clauses. (This is more helpful, because the lack of associated types is a confusing omission and it lets users more easily track the state of the feature.)
docs: Fix some 'second-edition' links
If I understand it correctly, we now want to link to
https://doc.rust-lang.org/book/*.html
instead of
https://doc.rust-lang.org/book/second-edition/*.html
because the second-edition page says that it's no longer distributed with
Rust's docs.
For example: https://doc.rust-lang.org/book/second-edition/ch13-01-closures.html
use structured suggestion when casting a reference
make note of one more normalization that Paths do
Fixesrust-lang#29008
…crum
note that FromStr does not work for borrowed types
Fixesrust-lang#47757
Remove submodule step from README
Since the bootstrap does it now
Add a profiles section to the manifest
This supports the profiles work for Rustup in a backwards compatible manner.
r? @alexcrichton
Fix undefined behavior
From the [`MaybeUninit::get_mut` docs](https://doc.rust-lang.org/std/mem/union.MaybeUninit.html):
> It is up to the caller to guarantee that the the MaybeUninit really is in an initialized state, otherwise this will immediately cause undefined behavior.
r? @joshtriplett
Correct RELEASES.md for 1.32.0
The `into_to_from_bytes` feature was stabilized for `i128` and `u128` just like for the other integer types, but they seem to have been missed.
don't unwrap unexpected tokens in `format!`
Fixesrust-lang#57512.
…rns, r=Centril
Stabilise irrefutable if-let and while-let patterns
This stabilises RFC 2086 (rust-lang#44495).
This replaces rust-lang#55639, as we want to stabilise this in time for the beta cut-off.
Closesrust-lang#55639.
r? @Centril
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=26

@bors

bors commented Jan 12, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 3117784 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 12, 2019
@bors

bors commented Jan 12, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3117784 with merge d6525ef...

bors added a commit that referenced this pull request Jan 12, 2019
Rollup of 26 pull requests
Successful merges:
- #56425 (Redo the docs for Vec::set_len)
- #56906 (Issue #56905)
- #57042 (Don't call `FieldPlacement::count` when count is too large)
- #57175 (Stabilize `let` bindings and destructuring in constants and const fn)
- #57192 (Change std::error::Error trait documentation to talk about `source` instead of `cause`)
- #57296 (Fixed the link to the ? operator)
- #57368 (Use CMAKE_{C,CXX}_COMPILER_LAUNCHER for ccache)
- #57400 (Rustdoc: update Source Serif Pro and replace Heuristica italic)
- #57417 (rustdoc: use text-based doctest parsing if a macro is wrapping main)
- #57433 (Add link destination for `read-ownership`)
- #57434 (Remove `CrateNum::Invalid`.)
- #57441 (Supporting backtrace for x86_64-fortanix-unknown-sgx.)
- #57450 (actually take a slice in this example)
- #57459 (Reference tracking issue for inherent associated types in diagnostic)
- #57463 (docs: Fix some 'second-edition' links)
- #57466 (Remove outdated comment)
- #57493 (use structured suggestion when casting a reference)
- #57498 (make note of one more normalization that Paths do)
- #57499 (note that FromStr does not work for borrowed types)
- #57505 (Remove submodule step from README)
- #57510 (Add a profiles section to the manifest)
- #57511 (Fix undefined behavior)
- #57519 (Correct RELEASES.md for 1.32.0)
- #57522 (don't unwrap unexpected tokens in `format!`)
- #57530 (Fixing a typographical error.)
- #57535 (Stabilise irrefutable if-let and while-let patterns)
Failed merges:
r? @ghost
@bors

bors commented Jan 12, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing d6525ef to master...

@bors
bors merged commit 3117784 into rust-lang:masterJan 12, 2019
@Centril
Centril deleted the rollup branch January 12, 2019 23:07
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Centril@bors@scottmcm@pnkfelix@JosephTLyons@petrhosek@tspiteri@QuietMisdreavus@ecstatic-morse@nnethercote@czipperz@varkor@blitzerr@phansch@oli-obk@king6cong@steveklabnik@euclio@pthariensflame@insideoutclub