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 #65223

Merged
merged 17 commits into from
Oct 9, 2019
Merged

Rollup of 7 pull requests #65223

merged 17 commits into from
Oct 9, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 8, 2019

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrum and others added 17 commits October 3, 2019 21:34
This commit modifies resolve to disallow foreign statics that use
parent generics.

`improper_ctypes` is not written to support type parameters, as these
are normally disallowed before the lint is run. Thus, type parameters in
foreign statics must be prohibited before the lint.

The only other case where this *could* have occured is in functions,
but typeck prohibits this with a "foreign items may not have type
parameters" error - a similar error did not exist for statics, because
statics cannot have type parameters, but they can use any
type parameters that are in scope (which isn't the case for functions).

Signed-off-by: David Wood <[email protected]>
…rochenkov

Warn if include macro fails to include entire file

This currently introduces an error, mainly because that was just simpler, and I'm not entirely certain if we can introduce a lint without an RFC and such.

This is primarily to get feedback on the approach and overall aim -- in particular, do we think this is helpful? If so, we probably will need lang-team sign off and decide if it should be an error (as currently introduced by this PR), a lint, or a warning.

r? @petrochenkov

cc rust-lang#35560
…eneric-in-foreign-mod, r=petrochenkov

typeck: prohibit foreign statics w/ generics

Fixes rust-lang#65035 and fixes rust-lang#65025.

This PR modifies resolve to disallow foreign statics that have
generics.

`improper_ctypes` is not written to support type parameters, as these
are normally disallowed before the lint is run. Thus, type parameters in
foreign statics must be prohibited before the lint.

The only other case where this *could* have occured is in functions,
but typeck prohibits this with a "foreign items may not have type
parameters" error - a similar error did not exist for statics, because
statics cannot have type parameters, but they can use any
type parameters that are in scope (which isn't the case for functions).
…, r=Mark-Simulacrum

Add check for missing tests for error codes

Fixes rust-lang#64811.

r? @Mark-Simulacrum
…crum

Replace code of conduct with link

This will replace the code of conduct and link to a single version at https://www.rust-lang.org/conduct.html
Fixes rust-lang#61531 (comment)

r? @Mark-Simulacrum
Use structured suggestion for removal of `as_str()` call

Follow up to rust-lang#64739.
Ignore `ExprKind::DropTemps` for some ref suggestions

Introduce `Expr::peel_drop_temps()` to ignore `ExprKind::DropTemps` for suggestions that depend on the `ExprKind` for accuracy.
@Centril
Copy link
Contributor Author

Centril commented Oct 8, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Oct 8, 2019

📌 Commit ff51611 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 Oct 8, 2019
@bors
Copy link
Contributor

bors commented Oct 8, 2019

⌛ Testing commit ff51611 with merge b5bd31e...

bors added a commit that referenced this pull request Oct 8, 2019
Rollup of 7 pull requests

Successful merges:

 - #64284 (Warn if include macro fails to include entire file)
 - #65081 (Remove -Zprofile-queries)
 - #65133 (typeck: prohibit foreign statics w/ generics)
 - #65135 (Add check for missing tests for error codes)
 - #65141 (Replace code of conduct with link)
 - #65194 (Use structured suggestion for removal of `as_str()` call)
 - #65213 (Ignore `ExprKind::DropTemps` for some ref suggestions)

Failed merges:

r? @ghost
@Centril Centril added the rollup A PR which is a rollup label Oct 8, 2019
@bors
Copy link
Contributor

bors commented Oct 9, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2019
@bors bors merged commit ff51611 into rust-lang:master Oct 9, 2019
@Centril Centril deleted the rollup-5sdvdni branch October 9, 2019 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

7 participants