stabilise ?, attributes on stmts, deprecate Reflect#36995

nrc · 2016-10-06T05:55:18Z

r? @nikomatsakis

Manishearth

lgtm, not sure if libs/lang team folks need to sign off. r=me otherwise

Manishearth · 2016-10-06T08:55:42Z

src/librustc/diagnostics.rs

doesn't this text apply to ? as well?

Maybe he removed it because its not accurate anymore: #36988

No, annoyingly you get an error message about the Carrier trait

petrochenkov · 2016-10-06T09:21:56Z

src/libcore/macros.rs

propogation -> propagation

? is built in to the language and is more succinct than try!, it is the standard method for error propogation.

These are two separate sentences and probably shouldn't be separated by a comma.

frewsxcv · 2016-10-06T13:19:27Z

For the sake of cross-linking, here's the link to the tracking issue: #31436

nrc · 2016-10-06T19:29:07Z

Also cc #15701, #27749

bors · 2016-10-07T18:41:17Z

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

nikomatsakis · 2016-10-11T13:53:29Z

This looks good to me, though I do think we ought to try and address #36988.

nikomatsakis · 2016-10-11T13:53:40Z

@bors r+

bors · 2016-10-11T13:53:41Z

📌 Commit adb4e2f has been approved by nikomatsakis

bluss · 2016-10-11T14:40:43Z

What's the type inference situation? It used to be that replacing try!(x) with x? would not infer as often.

Has this been cratered to look for such issues?

nrc · 2016-10-11T19:37:33Z

@bluss good point, I had mis-remembered this issue. We have indeed done a bunch of Crater runs, but to test whether ? is forwards compatible with the Carrier trait, which requires some backwards incompatibility between try! and ?. I don't think we can ever replace the implementation of try! in a backwards compatible way and that shouldn't be in this PR.

@bors: r-

cc [`?` tracking issue](rust-lang#31436)

Note that attributes on expressions are still unstable and are behind the `stmt_expr_attributes` flag. cc [Tracking issue](rust-lang#15701)

[tracking issue](rust-lang#27749)

nrc · 2016-10-11T19:41:32Z

@bors: r=@nikomatsakis

bors · 2016-10-11T19:41:33Z

📌 Commit 79b5177 has been approved by @nikomatsakis

@nikomatsakis

stabilise ?, attributes on stmts, deprecate Reflect r? @nikomatsakis

Rollup of 17 pull requests - Successful merges: #36762, #36831, #36973, #36991, #36995, #37023, #37049, #37050, #37056, #37064, #37066, #37067, #37084, #37089, #37091, #37092, #37110 - Failed merges:

nikomatsakis · 2016-10-12T21:46:28Z

@nrc

I don't think we can ever replace the implementation of try! in a backwards compatible way and that shouldn't be in this PR.

argh, I missed that this change was even in the PR! good catch @bluss

Reflect is no longer required as of rust-lang/rust#36995.

rust-highfive assigned nikomatsakis Oct 6, 2016

nrc mentioned this pull request Oct 6, 2016

Tracking issue for stmt_expr_attributes: Add attributes to expressions, etc. #15701

Open

5 tasks

Manishearth approved these changes Oct 6, 2016

View reviewed changes

petrochenkov reviewed Oct 6, 2016

View reviewed changes

msjyoo approved these changes Oct 6, 2016

View reviewed changes

nrc added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Oct 6, 2016

nrc force-pushed the stable branch from 5a2a15b to adb4e2f Compare October 9, 2016 21:53

Nick Cameron added 4 commits October 12, 2016 08:40

Stabilise ?

9bc6d26

cc [`?` tracking issue](rust-lang#31436)

Stabilise attributes on statements.

a94f593

Note that attributes on expressions are still unstable and are behind the `stmt_expr_attributes` flag. cc [Tracking issue](rust-lang#15701)

Deprecate Reflect

14c62f9

[tracking issue](rust-lang#27749)

Review changes

79b5177

nrc force-pushed the stable branch from adb4e2f to 79b5177 Compare October 11, 2016 19:40

alexcrichton mentioned this pull request Oct 12, 2016

Rollup of 17 pull requests #37118

Merged

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Oct 12, 2016

Rollup merge of rust-lang#36995 - nrc:stable, r=@nikomatsakis

9d70ff3

stabilise ?, attributes on stmts, deprecate Reflect r? @nikomatsakis

bors merged commit 79b5177 into rust-lang:master Oct 13, 2016

nrc mentioned this pull request Oct 18, 2016

[beta] backports #37239

Merged

This was referenced Oct 18, 2016

start of error handling rust-lang/book#134

Merged

Tracking issue for ? operator and try blocks (RFC 243, question_mark & try_blocks features) #31436

Open

brson mentioned this pull request Oct 19, 2016

[beta] backports #37266

Merged

alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 19, 2016

brson mentioned this pull request Nov 7, 2016

Add changelog for 1.13.0 #37600

Merged

dtolnay added a commit to dtolnay/erased-serde that referenced this pull request Dec 24, 2016

Update reason for not using TypeId

101e0d7

Reflect is no longer required as of rust-lang/rust#36995.

pnkfelix mentioned this pull request Sep 22, 2018

is #[cfg] applicable to *some* non-stmt expressions? #32796

Closed

ehuss mentioned this pull request Mar 3, 2020

Inner attributes on block expressions on match arms are not allowed #69675

Closed

chinoto mentioned this pull request Jan 25, 2023

Add Bytes DataGuard rwf2/Rocket#2362

Closed

Uh oh!

Conversation

nrc commented Oct 6, 2016

Uh oh!

Manishearth left a comment

Choose a reason for hiding this comment

Uh oh!

Manishearth Oct 6, 2016

Choose a reason for hiding this comment

Uh oh!

est31 Oct 6, 2016

Choose a reason for hiding this comment

Uh oh!

nrc Oct 6, 2016

Choose a reason for hiding this comment

Uh oh!

petrochenkov Oct 6, 2016

Choose a reason for hiding this comment

Uh oh!

frewsxcv Oct 6, 2016

Choose a reason for hiding this comment

Uh oh!

frewsxcv commented Oct 6, 2016

Uh oh!

nrc commented Oct 6, 2016

Uh oh!

bors commented Oct 7, 2016

Uh oh!

nikomatsakis commented Oct 11, 2016

Uh oh!

nikomatsakis commented Oct 11, 2016

Uh oh!

bors commented Oct 11, 2016

Uh oh!

bluss commented Oct 11, 2016

Uh oh!

nrc commented Oct 11, 2016

Uh oh!

nrc commented Oct 11, 2016

Uh oh!

bors commented Oct 11, 2016

Uh oh!

nikomatsakis commented Oct 12, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants