Skip to content

Rollup of 10 pull requests - #75383

Merged
bors merged 47 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-6hi36zn
Aug 11, 2020
Merged

Rollup of 10 pull requests#75383
bors merged 47 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-6hi36zn

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

Ryan1729and others added 30 commits August 6, 2020 04:24
…R_CASTS handling after the match
The reason I did this in the first place was to try and figure out why I don't see my expected 7 error messages
This seemed to overdo it a bit, affecting multiple submodules, and changing a file I didn't touch, so I didn't commit those changes
Co-authored-by: Philipp Krones <hello@philkrones.com>
This commit fixes an issue with rust-lang#74695 where the fptosi and fptoui
specializations on wasm were accidentally used on vector types by the
`simd_cast` intrinsic. This issue showed up as broken CI for the stdsimd
crate. Here this commit simply skips the specialization on vector kinds
flowing into `fpto{s,u}i`.
Previously if the compiler error'd, fatally, then temporary directories which
should be preserved by -Csave-temps would be deleted due to fatal compiler
errors being implemented as panics.
This commit restricts the substitution polymorphization added in rust-lang#75255
to only apply to the tupled upvar substitution, rather than all
substitutions, fixing a bunch of regressions when polymorphization is
enabled.
Signed-off-by: David Wood <david@davidtw.co>
denisvasilikand others added 17 commits August 9, 2020 23:06
Fixesrust-lang#75361Fixesrust-lang#74918
Previously, we were creating a new `InferCtxt`, which caused an ICE when
used with type variables from the existing `InferCtxt`
…xperiment, r=oli-obk
Clippy pointer cast lint experiment
This PR is an experiment about exposing more parts of `rustc_typeck` for use in `clippy`. In particular, the code that checks where a cast is valid or not was exposed, which necessitated exposing [`FnCtxt`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_typeck/check/struct.FnCtxt.html), and figuring out how to create an instance of that type inside `clippy`.
This was prompted by [this clippy issue](rust-lang/rust-clippy#2064).
r? @oli-obk
…Manishearth
Only add a border for the rust logo
![Screenshot from 2020-08-07 11-22-51](https://user-images.githubusercontent.com/3050060/89631113-9dadc700-d8a0-11ea-8063-ad40207decaa.png)
![Screenshot from 2020-08-07 11-19-47](https://user-images.githubusercontent.com/3050060/89631114-9e465d80-d8a0-11ea-96ba-1d6926c8e7a9.png)
![Screenshot from 2020-08-07 11-19-41](https://user-images.githubusercontent.com/3050060/89631117-9edef400-d8a0-11ea-9c66-0df3d8c1ac2d.png)
I didn't add a border for the light theme though, as I felt it as unnecessary.
r? @Manishearth
…tic-morse
Avoid deleting temporary files on error
Previously if the compiler error'd, fatally, then temporary directories which
should be preserved by -Csave-temps would be deleted due to fatal compiler
errors being implemented as panics.
cc @infinity0
(Hopefully) fixesrust-lang#75275, but I haven't tested
Don't try to use wasm intrinsics on vectors
This commit fixes an issue with rust-lang#74695 where the fptosi and fptoui
specializations on wasm were accidentally used on vector types by the
`simd_cast` intrinsic. This issue showed up as broken CI for the stdsimd
crate. Here this commit simply skips the specialization on vector kinds
flowing into `fpto{s,u}i`.
…xes, r=eddyb
instance: only polymorphize upvar substs
This PR restricts the substitution polymorphization added in rust-lang#75255 to only apply to the tupled upvar substitution, rather than all substitutions, fixing a bunch of regressions when polymorphization is
enabled.
Due to an oversight on my part, when landing rust-lang#75260 and rust-lang#75255, some tests started failing when polymorphization was enabled that I didn't notice until after landing - this PR fixes the regressions from rust-lang#75255. rust-lang#75336 has been filed to make sure that we don't forget to try make this change again in future, as it does enable some optimisations.
r? @lcnr
evaluate required_consts when pushing stack frame in Miri engine
[Just like codegen](https://github.com/rust-lang/rust/pull/70820/files#diff-32c57af5c8e23eb048f55d1e955e5cd5R194), Miri needs to make sure all `required_consts` evaluate successfully, to catch post-monomorphization errors.
While at it I also moved the const_eval error reporting logic into rustc_mir::const_eval::error; there is no reason it should be in `rustc_middle`. I kept this in a separate commit for easier reviewing.
Helps with rust-lang/miri#1382. I will add a test on the Miri side (done now: rust-lang/miri#1504).
r? @oli-obk
Use existing `infcx` when emitting trait impl diagnostic
Fixesrust-lang#75361Fixesrust-lang#74918
Previously, we were creating a new `InferCtxt`, which caused an ICE when
used with type variables from the existing `InferCtxt`
…orrow, r=Manishearth
Move to intra-doc links in /library/core/src/borrow.rs
Helps with rust-lang#75080.
@rustbot modify labels: T-doc, A-intra-doc-links, T-rustdoc
Known issues:
* Links from `core` to `std` (rust-lang#74481):
* [`Box<T>`]
* [`Mutex<T>`]
* [`Rc<T>`]
* [`String`]
* [`HashMap<K, V>`]
…cmp, r=Dylan-DPC
Use intra-doc links in /library/core/src/cmp.rs
Helps with rust-lang#75080.
@rustbot modify labels: T-doc, A-intra-doc-links, T-rustdoc
Known issues:
* Links from `core` to `std` (rust-lang#74481):
* [`Vec::sort_by_key`]
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ p=5 rollup=never

@bors

bors commented Aug 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0a738d4 has been approved by Dylan-DPC

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

bors commented Aug 11, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0a738d4 with merge 7189ca6...

@bors

bors commented Aug 11, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: Dylan-DPC
Pushing 7189ca6 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 11, 2020
@bors
bors merged commit 7189ca6 into rust-lang:masterAug 11, 2020
@JohnTitorJohnTitor added the rollup A PR which is a rollup label Aug 11, 2020
@cuvipercuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.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.

13 participants

@Dylan-DPC-zz@bors@cuviper@JohnTitor@Ryan1729@GuillaumeGomez@alexcrichton@Mark-Simulacrum@RalfJung@davidtwco@denisvasilik@Aaron1011@Dylan-DPC