Skip to content
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

Rollup of 7 pull requests #63025

Closed
wants to merge 29 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 26, 2019

Successful merges:

Failed merges:

r? @ghost

taiki-e and others added 29 commits July 16, 2019 01:14
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
This commit adds a reproduction of the error reported in servo which
demonstrates the current, incorrect behaviour.

Co-authored-by: Rémy Rakić <remy.rakic@gmail.com>
The Dumper no longer has anything to do specifically with JSON, it
merely represents processing into an `Analysis` output.
Move `source_uitil` macros into `syntax_ext`
Cleanup dependencies of `rustc_driver`
Few other minor renamings for consistency.
Remove one unused dependency from `rustc_passes`.
Fix libsyntax tests.
Fix rebase.
This commit implements a hacky fix for detecting when a span is pointing
at a macro call site so that bare trait lints are not made incorrectly.
…me-elision-2, r=Centril

Allow lifetime elision in `Pin<&(mut) Self>`

This PR changes `self: &(mut) S` elision rules to instead visit the type of `self` and look for `&(mut) S` (where `is_self_ty(S)`) within it

Replaces rust-lang#60944

Closes rust-lang#52675

r? @eddyb
cc @cramertj @Centril @withoutboats @scottmcm
Break dependencies between `syntax_ext` and other crates

Move `source_util` macros into `syntax_ext`.
Move other early code generation facilities like standard library injection into `syntax_ext`.

The only crate that depends on `syntax_ext` now is `rustc_interface` which is one of the "final" crates that depend on everything.

Minor: Cleanup dependencies of `rustc_driver`, many of them are no longer used after introduction of `rustc_interface`.

r? @eddyb
bump crossbeam-epoch dependency

The new crossbeam-epoch release depends on a memoffset with a whole bunch of soundness holes fixed.

The old memoffset is still indirectly depended on (at least) by rustc-rayon, though -- a crate that looks rather unmaintained (no change in more than a year).
… r=Xanewok

Cleanup save-analysis JsonDumper
add `repr(transparent)` to `IoSliceMut` where missing

tried using `IoSliceMut` in FFI, got `improper_ctypes` warning.

according to the docs: `IoSliceMut` is  "guaranteed to be ABI compatible with the `iovec` type" so it should be usable in FFI.
`IoSlice` is also `repr(transparent)` for every platform where these types contain `iovec`-like types.
vxworks also has `IoSliceMut` as transparent so its not even consistently one or the other.

no comment about this next to the types or in the PR that introduced the types, so assuming this was just missed.

r? @sfackler
…gestion, r=estebank

Stop bare trait lint applying to macro call sites

Fixes rust-lang#61963. Apologies for the delay with in fixing this. If anyone has a better idea how to detect this macro call site case, I'd be happy to fix this in a more robust, less hacky way.

r? @estebank
@Centril
Copy link
Contributor Author

Centril commented Jul 26, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Jul 26, 2019

📌 Commit f12327b has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 26, 2019
@bors
Copy link
Contributor

bors commented Jul 26, 2019

⌛ Testing commit f12327b with merge 7430acd7310c26e9801b5d7a5240408fce818d7d...

@rust-highfive
Copy link
Collaborator

Your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-07-26T20:47:03.6141427Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-26T20:47:03.6319647Z ##[command]git config gc.auto 0
2019-07-26T20:47:03.6392858Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-26T20:47:03.6449775Z ##[command]git config --get-all http.proxy
2019-07-26T20:47:03.6591384Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63025/merge:refs/remotes/pull/63025/merge
---
2019-07-26T20:47:39.9118929Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-26T20:47:39.9118976Z 
2019-07-26T20:47:39.9119310Z   git checkout -b <new-branch-name>
2019-07-26T20:47:39.9119344Z 
2019-07-26T20:47:39.9119418Z HEAD is now at 7f11f0725 Merge f12327b565316c168150a075317b67457b26dafd into c43753f910aae000f8bcb0a502407ea332afc74b
2019-07-26T20:47:39.9267667Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-26T20:47:39.9317883Z ==============================================================================
2019-07-26T20:47:39.9317950Z Task         : Bash
2019-07-26T20:47:39.9318016Z Description  : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Centril
Copy link
Contributor Author

Centril commented Jul 26, 2019

@bors retry

@bors
Copy link
Contributor

bors commented Jul 26, 2019

⌛ Testing commit f12327b with merge f051aab3476e493aad1ddd0fa9616a26e4387ecc...

@rust-highfive
Copy link
Collaborator

Your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-07-26T21:15:10.4387391Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-26T21:15:10.4387849Z 
2019-07-26T21:15:10.4388317Z   git checkout -b <new-branch-name>
2019-07-26T21:15:10.4388977Z 
2019-07-26T21:15:10.4389527Z HEAD is now at f051aab34 Auto merge of #63025 - Centril:rollup-10kfdv9, r=Centril
2019-07-26T21:15:10.4578456Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-26T21:15:10.4581514Z ==============================================================================
2019-07-26T21:15:10.4581624Z Task         : Bash
2019-07-26T21:15:10.4581696Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-26T21:20:15.2234545Z Script contents:
2019-07-26T21:20:15.2235074Z aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$SYSTEM_JOBNAME.csv
2019-07-26T21:20:15.2252810Z ========================== Starting Command Output ===========================
2019-07-26T21:20:15.2277534Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/81439cfa-8a60-4dd9-b85e-b23ccc08eff9.sh
2019-07-26T21:20:15.2369291Z /home/vsts/work/_temp/81439cfa-8a60-4dd9-b85e-b23ccc08eff9.sh: line 1: aws: command not found
2019-07-26T21:20:15.2402985Z ##[error]Bash exited with code '127'.
2019-07-26T21:20:15.2429197Z ##[section]Starting: Checkout
2019-07-26T21:20:15.2430906Z ==============================================================================
2019-07-26T21:20:15.2431011Z Task         : Get sources
2019-07-26T21:20:15.2431089Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Jul 26, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 26, 2019
@Centril Centril closed this Jul 26, 2019
@Centril Centril deleted the rollup-10kfdv9 branch July 26, 2019 21:49
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet