Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Rollup of 5 pull requests #66225

Merged
merged 20 commits into from
Nov 8, 2019
Merged

Rollup of 5 pull requests #66225

merged 20 commits into from
Nov 8, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Nov 8, 2019

Successful merges:

Failed merges:

r? @ghost

Centril and others added 20 commits November 6, 2019 11:08
Having a function `to_usize` that does not return a usize is somewhat confusing
Transition future compat lints to {ERROR, DENY} - Take 2

Follow up to rust-lang#63247 implementing rust-lang#63247 (comment).

- `legacy_ctor_visibility` (ERROR) -- closes rust-lang#39207
- `legacy_directory_ownership` (ERROR) -- closes rust-lang#37872
- `safe_extern_static` (ERROR) -- closes rust-lang#36247
- `parenthesized_params_in_types_and_modules` (ERROR) -- closes rust-lang#42238
- `duplicate_macro_exports` (ERROR)
- `nested_impl_trait` (ERROR) -- closes rust-lang#59014
- `ill_formed_attribute_input` (DENY) -- transitions rust-lang#57571
- `patterns_in_fns_without_body` (DENY) -- transitions rust-lang#35203

r? @varkor
cc @petrochenkov
Remove "here" from "expected one of X here"
rename Memory::get methods to get_raw to indicate their unchecked nature

Some recent Miri PRs started using these methods when they should not; this should discourage their use.

In fact we could make these methods private to the `interp` module as far as Miri is concerned -- with the exception of the `uninit` intrinsic which will hopefully go away soon. @bjorn3 @oli-obk does priroda need these methods? It would be great to be able to seal them away.
miri: Rename to_{u,i}size to to_machine_{u,i}size

Having a function `to_usize` that does not return a (host) usize is somewhat confusing, so let's rename it.

r? @oli-obk
`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`

In both AST & HIR, rename `MethodSig` to `FnSig` and then proceed to use it in `ItemKind::Fn` so that the overall structure is more regular.

r? @davidtwco
@Centril
Copy link
Contributor Author

Centril commented Nov 8, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Nov 8, 2019

📌 Commit 65c77bc 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 Nov 8, 2019
@Centril Centril added the rollup A PR which is a rollup label Nov 8, 2019
@bors
Copy link
Contributor

bors commented Nov 8, 2019

⌛ Testing commit 65c77bc with merge 9e34664...

bors added a commit that referenced this pull request Nov 8, 2019
Rollup of 5 pull requests

Successful merges:

 - #65785 (Transition future compat lints to {ERROR, DENY} - Take 2)
 - #66007 (Remove "here" from "expected one of X here")
 - #66043 (rename Memory::get methods to get_raw to indicate their unchecked nature)
 - #66154 (miri: Rename to_{u,i}size to to_machine_{u,i}size)
 - #66188 (`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Nov 8, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 9e34664 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 8, 2019
@bors bors merged commit 65c77bc into rust-lang:master Nov 8, 2019
@bors bors mentioned this pull request Nov 8, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #66225!

Tested on commit 9e34664.
Direct link to PR: #66225

💔 miri on windows: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 8, 2019
Tested on commit rust-lang/rust@9e34664.
Direct link to PR: <rust-lang/rust#66225>

💔 miri on windows: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
@Centril Centril deleted the rollup-it0t5tk branch November 8, 2019 19:12
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: 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.

5 participants