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 4 pull requests #67866

Merged
merged 11 commits into from
Jan 4, 2020
Merged

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

wesleywiser and others added 11 commits January 2, 2020 21:21
- Use the span of the predicate
- Use the def's description instead of "struct/enum" (notably incorrect
  for unions)
- Align formatting with other error messages
These were perhaps supposed to be `#[link(name = "m")]` but linking libm should be handled by the libc crate anyway.
Revert `const_err` lint checking of casts

Reverts part of rust-lang#67676

r? @oli-obk

cc @SimonSapin
…enkov

improve some `Drop`-related error messages
…an-DPC

Remove unused `#[link_name = "m"]` attributes

These were perhaps supposed to be `#[link(name = "m")]` but linking libm should be handled by the libc crate anyway.

They should have triggered a compile error: rust-lang#47725
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=4

@bors
Copy link
Contributor

bors commented Jan 4, 2020

📌 Commit a86a189 has been approved by GuillaumeGomez

@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 Jan 4, 2020
@bors
Copy link
Contributor

bors commented Jan 4, 2020

⌛ Testing commit a86a189 with merge cd8377d...

bors added a commit that referenced this pull request Jan 4, 2020
Rollup of 4 pull requests

Successful merges:

 - #67822 (Revert `const_err` lint checking of casts)
 - #67823 (improve some `Drop`-related error messages)
 - #67837 (Clean up err codes)
 - #67848 (Remove unused `#[link_name = "m"]` attributes)

Failed merges:

r? @ghost
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Jan 4, 2020
@bors
Copy link
Contributor

bors commented Jan 4, 2020

☀️ Test successful - checks-azure
Approved by: GuillaumeGomez
Pushing cd8377d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 4, 2020
@bors bors merged commit a86a189 into rust-lang:master Jan 4, 2020
@GuillaumeGomez GuillaumeGomez deleted the rollup-32vsg5b branch January 5, 2020 17:24
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