Stabilize shorter-tail-lifetimes #131983

dingxiangfei2009 · 2024-10-20T20:50:44Z

We found a test case tests/ui/drop/drop_order.rs that had not been covered by the change. The test fixture is fixed now with the correct expectation.

rustbot · 2024-10-20T20:50:52Z

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

dingxiangfei2009 · 2024-10-20T21:08:28Z

@rustbot labels +A-edition-2024

lcnr · 2024-10-21T10:33:13Z

compiler/rustc_lint/src/tail_expr_drop_order.rs

@@ -21,8 +21,7 @@ declare_lint! {
    /// Your discretion on the new drop order introduced by Edition 2024 is required.
    ///
    /// ### Example
-    /// ```rust,edition2024
-    /// #![feature(shorter_tail_lifetimes)]
+    /// ```rust,edition2021


existing, but "The tail_expr_drop_order lint looks for those values generated at the tail expression location, that of type with a significant Drop implementation, such as locks." seems wrong to me.

/// The `tail_expr_drop_order` lint looks for those values generated at the tail expression location, /// whose type has a significant `Drop` implementation, such as locks.

I have tweaked the wording for clarity

lcnr

you're also flipping the editions for which the lint fires from only linting in edition 2024+ to instead only lint in older editions.

Linting in editions <2024 seems correct to me, as the lint is supposed to warn of changes to drop order when switching to edition 2024. Do I understand this correctly?

lcnr · 2024-10-21T10:36:05Z

compiler/rustc_lint/src/tail_expr_drop_order.rs

@@ -185,7 +184,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LintVisitor<'a, 'tcx> {

 impl<'a, 'tcx> LintVisitor<'a, 'tcx> {
    fn check_block_inner(&mut self, block: &Block<'tcx>) {
-        if !block.span.at_least_rust_2024() {
+        if block.span.at_least_rust_2024() {
            // We only lint for Edition 2024 onwards


lcnr · 2024-10-21T10:39:47Z

tests/ui/drop/lint-tail-expr-drop-order-gated.rs

@@ -1,15 +1,8 @@
-// This test ensures that `tail_expr_drop_order` does not activate in case Edition 2024 is not used
-// or the feature gate `shorter_tail_lifetimes` is disabled.


given that you're removing the reasoning behind this test, shouldn't the whole test be removed entirely? alternatively keep this comment

lcnr

some nits, then r=me cc @nikomatsakis

dingxiangfei2009 · 2024-10-21T20:30:37Z

@lcnr

flipped

Yes, it was not corrected even after learning that we should fire the lint for code targeting Edition 2021 and before. It fell through the crack somehow.

Let me check the comments again to see if there is any outdated wording.

ehuss · 2024-10-22T19:33:25Z

compiler/rustc_feature/src/accepted.rs

@@ -361,6 +361,8 @@ declare_features! (
    (accepted, self_in_typedefs, "1.32.0", Some(49303)),
    /// Allows `Self` struct constructor (RFC 2302).
    (accepted, self_struct_ctor, "1.32.0", Some(51994)),
+    /// Shortern the tail expression lifetime
+    (accepted, shorter_tail_lifetimes, "1.79.0", Some(123739)),


I think this should be CURRENT_RUSTC_VERSION, correct?

compiler/rustc_lint/src/tail_expr_drop_order.rs

lcnr · 2024-10-23T14:43:13Z

@bors r+ rollup

bors · 2024-10-23T14:43:16Z

📌 Commit 43803df has been approved by lcnr

It is now in the queue for this repository.

…-tail-lifetimes, r=lcnr Stabilize shorter-tail-lifetimes Close rust-lang#131445 Tracked by rust-lang#123739 We found a test case `tests/ui/drop/drop_order.rs` that had not been covered by the change. The test fixture is fixed now with the correct expectation.

bors · 2024-10-23T16:11:53Z

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

dingxiangfei2009 · 2024-10-23T17:56:45Z

@lcnr Sorry I had to resolve merge conflicts.

@rustbot ready

lcnr · 2024-10-24T10:47:44Z

@bors r+

bors · 2024-10-24T10:47:47Z

📌 Commit 0689b21 has been approved by lcnr

It is now in the queue for this repository.

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#131790 (Document textual format of SocketAddrV{4,6}) - rust-lang#131983 (Stabilize shorter-tail-lifetimes) - rust-lang#132097 (sanitizer.md: LeakSanitizer is not supported on aarch64 macOS) - rust-lang#132107 (Remove visit_expr_post from ast Visitor) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#131983 - dingxiangfei2009:stabilize-shorter-tail-lifetimes, r=lcnr Stabilize shorter-tail-lifetimes Close rust-lang#131445 Tracked by rust-lang#123739 We found a test case `tests/ui/drop/drop_order.rs` that had not been covered by the change. The test fixture is fixed now with the correct expectation.

rustbot assigned lcnr Oct 20, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 20, 2024

rustbot added the A-edition-2024 Area: The 2024 edition label Oct 20, 2024

lcnr reviewed Oct 21, 2024

View reviewed changes

dingxiangfei2009 force-pushed the stabilize-shorter-tail-lifetimes branch from 27b60a8 to d51b702 Compare October 21, 2024 20:30

This was referenced Oct 22, 2024

Tracking Issue for RFC 3606: Drop temporaries in tail expressions before local variables #123739

Open

Stabilize if_let_rescope #131984

Merged

ehuss reviewed Oct 22, 2024

View reviewed changes

lcnr reviewed Oct 22, 2024

View reviewed changes

compiler/rustc_lint/src/tail_expr_drop_order.rs Outdated Show resolved Hide resolved

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 Oct 23, 2024

This was referenced Oct 23, 2024

Rollup of 8 pull requests #132069

Closed

Rollup of 4 pull requests #132071

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 23, 2024

stabilize shorter-tail-lifetimes

0689b21

dingxiangfei2009 force-pushed the stabilize-shorter-tail-lifetimes branch from 43803df to 0689b21 Compare October 23, 2024 17:56

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 23, 2024

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 Oct 24, 2024

matthiaskrgr mentioned this pull request Oct 24, 2024

Rollup of 4 pull requests #132116

Merged

bors merged commit 91c025d into rust-lang:master Oct 24, 2024
6 checks passed

rustbot added this to the 1.84.0 milestone Oct 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stabilize shorter-tail-lifetimes #131983

Stabilize shorter-tail-lifetimes #131983

dingxiangfei2009 commented Oct 20, 2024

rustbot commented Oct 20, 2024

dingxiangfei2009 commented Oct 20, 2024

lcnr Oct 21, 2024

dingxiangfei2009 Oct 23, 2024

lcnr left a comment

lcnr Oct 21, 2024

lcnr Oct 21, 2024

lcnr left a comment

dingxiangfei2009 commented Oct 21, 2024

ehuss Oct 22, 2024

dingxiangfei2009 Oct 23, 2024

lcnr commented Oct 23, 2024

bors commented Oct 23, 2024

bors commented Oct 23, 2024

dingxiangfei2009 commented Oct 23, 2024

lcnr commented Oct 24, 2024

bors commented Oct 24, 2024

		@@ -1,15 +1,8 @@
		// This test ensures that `tail_expr_drop_order` does not activate in case Edition 2024 is not used
		// or the feature gate `shorter_tail_lifetimes` is disabled.

Stabilize shorter-tail-lifetimes #131983

Stabilize shorter-tail-lifetimes #131983

Conversation

dingxiangfei2009 commented Oct 20, 2024

rustbot commented Oct 20, 2024

dingxiangfei2009 commented Oct 20, 2024

lcnr Oct 21, 2024

Choose a reason for hiding this comment

dingxiangfei2009 Oct 23, 2024

Choose a reason for hiding this comment

lcnr left a comment

Choose a reason for hiding this comment

lcnr Oct 21, 2024

Choose a reason for hiding this comment

lcnr Oct 21, 2024

Choose a reason for hiding this comment

lcnr left a comment

Choose a reason for hiding this comment

dingxiangfei2009 commented Oct 21, 2024

ehuss Oct 22, 2024

Choose a reason for hiding this comment

dingxiangfei2009 Oct 23, 2024

Choose a reason for hiding this comment

lcnr commented Oct 23, 2024

bors commented Oct 23, 2024

bors commented Oct 23, 2024

dingxiangfei2009 commented Oct 23, 2024

lcnr commented Oct 24, 2024

bors commented Oct 24, 2024