Skip to content

Ignore future deprecations in #[deprecated] - #58202

Merged
bors merged 7 commits into
rust-lang:masterfrom
varkor:deprecated-future-external
Feb 14, 2019
Merged

Ignore future deprecations in #[deprecated]#58202
bors merged 7 commits into
rust-lang:masterfrom
varkor:deprecated-future-external

Conversation

@varkor

Copy link
Copy Markdown
Contributor

The future deprecation warnings should only apply to #[rustc_deprecated] as they take into account rustc's version. Fixes#57952.

I've also slightly modified rustdoc's display of future deprecation notices to make it more consistent, so I'm assigning a rustdoc team member for review to make sure this is okay.

r? @GuillaumeGomez

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 5, 2019
@varkorvarkor changed the title Deprecated future externalIgnore future deprecations in #[deprecated]Feb 5, 2019
@rust-highfive

This comment has been minimized.

@varkor
varkorforce-pushed the deprecated-future-external branch from 3ea9d40 to d8bf945CompareFebruary 6, 2019 08:26
@GuillaumeGomez

Copy link
Copy Markdown
Member

Looks good to me. Please add a test for rustdoc as well and we're good to go!

@rust-highfive

This comment has been minimized.

@varkor

Copy link
Copy Markdown
ContributorAuthor

I've added a new test and updated the old one to ensure that we're checking both places the attribute can affect the docs.

@bors

bors commented Feb 7, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #58266) made this pull request unmergeable. Please resolve the merge conflicts.

@varkor
varkorforce-pushed the deprecated-future-external branch from e5089a7 to 18ca33bCompareFebruary 7, 2019 18:03
@GuillaumeGomez

Copy link
Copy Markdown
Member

Thanks!

@bors: r+

@bors

bors commented Feb 8, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 18ca33bde20b17352eb34cbde202d65daec30b5d has been approved by GuillaumeGomez

@borsbors 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 Feb 8, 2019
Comment threadsrc/test/ui/deprecation/deprecation-in-future.rs Outdated
@varkor
varkorforce-pushed the deprecated-future-external branch 2 times, most recently from a2666e8 to 241aad2CompareFebruary 11, 2019 11:32
@varkor

Copy link
Copy Markdown
ContributorAuthor

Added a test specifically for rustc_deprecated, as there didn't appear to be one already.

@bors r=GuillaumeGomez

@bors

bors commented Feb 11, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 241aad22f5c81c4bb57685d8f528781b1e1951a0 has been approved by GuillaumeGomez

@varkor
varkorforce-pushed the deprecated-future-external branch from 241aad2 to afad118CompareFebruary 11, 2019 11:37
@rust-highfive

This comment has been minimized.

@varkor
varkorforce-pushed the deprecated-future-external branch from afad118 to b5fa870CompareFebruary 11, 2019 13:18
@varkor

Copy link
Copy Markdown
ContributorAuthor

@bors r=GuillaumeGomez

@bors

bors commented Feb 11, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit b5fa870 has been approved by GuillaumeGomez

Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019
…r=GuillaumeGomez
Ignore future deprecations in #[deprecated]
The future deprecation warnings should only apply to `#[rustc_deprecated]` as they take into account rustc's version. Fixesrust-lang#57952.
I've also slightly modified rustdoc's display of future deprecation notices to make it more consistent, so I'm assigning a rustdoc team member for review to make sure this is okay.
r? @GuillaumeGomez
@CentrilCentril mentioned this pull request Feb 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019
…r=GuillaumeGomez
Ignore future deprecations in #[deprecated]
The future deprecation warnings should only apply to `#[rustc_deprecated]` as they take into account rustc's version. Fixesrust-lang#57952.
I've also slightly modified rustdoc's display of future deprecation notices to make it more consistent, so I'm assigning a rustdoc team member for review to make sure this is okay.
r? @GuillaumeGomez
@CentrilCentril mentioned this pull request Feb 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019
…r=GuillaumeGomez
Ignore future deprecations in #[deprecated]
The future deprecation warnings should only apply to `#[rustc_deprecated]` as they take into account rustc's version. Fixesrust-lang#57952.
I've also slightly modified rustdoc's display of future deprecation notices to make it more consistent, so I'm assigning a rustdoc team member for review to make sure this is okay.
r? @GuillaumeGomez
@CentrilCentril mentioned this pull request Feb 13, 2019
bors added a commit that referenced this pull request Feb 13, 2019
Rollup of 10 pull requests
Successful merges:
- #58110 (libpanic_unwind => 2018)
- #58167 (HirId-ify hir::BodyId)
- #58202 (Ignore future deprecations in #[deprecated])
- #58272 (Cut down on number formating code size)
- #58276 (Improve the error messages for missing stability attributes)
- #58354 (Fix ICE and invalid filenames in MIR printing code)
- #58381 (Only suggest imports if not imported.)
- #58386 (Fix#54242)
- #58400 (Fix rustc_driver swallowing errors when compilation is stopped)
- #58420 (target/uefi: clarify documentation)
Failed merges:
r? @ghost
@bors
bors merged commit b5fa870 into rust-lang:masterFeb 14, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@varkor@rust-highfive@GuillaumeGomez@bors@RalfJung