Skip to content

Conversation

XAMPPRocky
Copy link
Member

Rendered

r? @Mark-Simulacrum
cc @rust-lang/release

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 13, 2019
@Mark-Simulacrum
Copy link
Member

Please add #65294 (comment) to compatibility notes (the PR; that link points at example crates that broke, but we should not list those).

@XAMPPRocky
Copy link
Member Author

@Mark-Simulacrum What's the compat note in this case? Rustc now warns when #[inline] is ignored?

@Mark-Simulacrum
Copy link
Member

There are some error cases added as well, e.g. inline on trait items I believe is now a hard error. @varkor -- can you maybe write up a quick blurb?

@varkor
Copy link
Member

varkor commented Nov 18, 2019

Is something like this sufficient?

Using #[inline] on function prototypes and consts now emits a warning under unused_attribute.
Using #[inline] anywhere else inside traits or extern blocks now correctly emits an error.

@XAMPPRocky
Copy link
Member Author

Added to notes.

Copy link
Member

@ollie27 ollie27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#63803 also needs to be included.

@Mark-Simulacrum
Copy link
Member

This looks great, thanks! Will let it sit for a week or so and aim to merge around the Friday before release week.

Co-Authored-By: Mark Rousskov <[email protected]>
@imp
Copy link

imp commented Dec 10, 2019

Shouldn't stabilization of feature(result_map_or_else) (#66322) be mentioned as well?

@XAMPPRocky
Copy link
Member Author

XAMPPRocky commented Dec 10, 2019

@imp That PR mentions that it is stabilised in 1.41.0 and these are release notes for 1.40.0. Also this seems to be actual stabilisation PR #66570

@imp
Copy link

imp commented Dec 10, 2019

@XAMPPRocky Right, my bad

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=always

Let's get this landed and we can send followup PRs if needed.

@bors
Copy link
Collaborator

bors commented Dec 10, 2019

📌 Commit dbfb00c has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 10, 2019
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Dec 10, 2019
bors added a commit that referenced this pull request Dec 11, 2019
Rollup of 9 pull requests

Successful merges:

 - #66377 (Update RELEASES.md for 1.40.0)
 - #67134 (Ensure that we get a hard error on generic ZST constants if their bod…)
 - #67152 (Sort auto trait and blanket implementations display)
 - #67154 (Fix typos in src/libcore/alloc.rs docs)
 - #67168 (corrected comment in E0478)
 - #67178 (Move non clean impls items)
 - #67180 (doc: Use .copied() instead of .cloned() in Vec example)
 - #67181 (Update hashmap doc)
 - #67193 (In which we start tracking polonius in `-Z self-profile`)

Failed merges:

r? @ghost
@bors bors merged commit dbfb00c into rust-lang:master Dec 11, 2019
@XAMPPRocky XAMPPRocky deleted the relnotes-1.40.0 branch December 11, 2019 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.