Skip to content
/ rust Public
forked from rust-lang/rust

Commit c1a739a

Browse files
jhprattjhpratt
authored
Rollup merge of rust-lang#134368 - ehuss:edition-links, r=jieyouxu
Use links to edition guide for edition migrations This switches the migration lints for the 2024 edition to point to the edition guide documentation instead of the tracking issues. I expect the documentation should be easier to understand for a user, compared to most of the issues which don't have any direct information, and can be a bit confusing to navigate, or have outdated information.
2 parents cc5392a + 3e80697 commit c1a739a

File tree

42 files changed

+200
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+200
-190
lines changed

Diff for: ‎compiler/rustc_lint/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1814,7 +1814,7 @@ declare_lint! {
18141814
"detects edition keywords being used as an identifier",
18151815
@future_incompatible = FutureIncompatibleInfo {
18161816
reason: FutureIncompatibilityReason::EditionError(Edition::Edition2024),
1817-
reference: "issue #49716 <https://github.com/rust-lang/rust/issues/49716>",
1817+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/gen-keyword.html>",
18181818
};
18191819
}
18201820

Diff for: ‎compiler/rustc_lint/src/if_let_rescope.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ declare_lint! {
8484
rewriting in `match` is an option to preserve the semantics up to Edition 2021",
8585
@future_incompatible = FutureIncompatibleInfo {
8686
reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2024),
87-
reference: "issue #124085 <https://github.com/rust-lang/rust/issues/124085>",
87+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>",
8888
};
8989
}
9090

Diff for: ‎compiler/rustc_lint/src/shadowed_into_iter.rs

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ declare_lint! {
6161
"detects calling `into_iter` on boxed slices in Rust 2015, 2018, and 2021",
6262
@future_incompatible = FutureIncompatibleInfo {
6363
reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2024),
64+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/intoiterator-box-slice.html>"
6465
};
6566
}
6667

Diff for: ‎compiler/rustc_lint_defs/src/builtin.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1677,7 +1677,7 @@ declare_lint! {
16771677
"detects patterns whose meaning will change in Rust 2024",
16781678
@future_incompatible = FutureIncompatibleInfo {
16791679
reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2024),
1680-
reference: "123076",
1680+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/match-ergonomics.html>",
16811681
};
16821682
}
16831683

@@ -2606,7 +2606,7 @@ declare_lint! {
26062606
"unsafe operations in unsafe functions without an explicit unsafe block are deprecated",
26072607
@future_incompatible = FutureIncompatibleInfo {
26082608
reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2024),
2609-
reference: "issue #71668 <https://github.com/rust-lang/rust/issues/71668>",
2609+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/unsafe-op-in-unsafe-fn.html>",
26102610
explain_reason: false
26112611
};
26122612
@edition Edition2024 => Warn;
@@ -4189,7 +4189,7 @@ declare_lint! {
41894189
"never type fallback affecting unsafe function calls",
41904190
@future_incompatible = FutureIncompatibleInfo {
41914191
reason: FutureIncompatibilityReason::EditionAndFutureReleaseSemanticsChange(Edition::Edition2024),
4192-
reference: "issue #123748 <https://github.com/rust-lang/rust/issues/123748>",
4192+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>",
41934193
};
41944194
@edition Edition2024 => Deny;
41954195
report_in_external_macro
@@ -4243,7 +4243,7 @@ declare_lint! {
42434243
"never type fallback affecting unsafe function calls",
42444244
@future_incompatible = FutureIncompatibleInfo {
42454245
reason: FutureIncompatibilityReason::EditionAndFutureReleaseError(Edition::Edition2024),
4246-
reference: "issue #123748 <https://github.com/rust-lang/rust/issues/123748>",
4246+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/never-type-fallback.html>",
42474247
};
42484248
report_in_external_macro
42494249
}
@@ -4790,7 +4790,7 @@ declare_lint! {
47904790
"detects unsafe functions being used as safe functions",
47914791
@future_incompatible = FutureIncompatibleInfo {
47924792
reason: FutureIncompatibilityReason::EditionError(Edition::Edition2024),
4793-
reference: "issue #27970 <https://github.com/rust-lang/rust/issues/27970>",
4793+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/newly-unsafe-functions.html>",
47944794
};
47954795
}
47964796

@@ -4826,7 +4826,7 @@ declare_lint! {
48264826
"detects missing unsafe keyword on extern declarations",
48274827
@future_incompatible = FutureIncompatibleInfo {
48284828
reason: FutureIncompatibilityReason::EditionError(Edition::Edition2024),
4829-
reference: "issue #123743 <https://github.com/rust-lang/rust/issues/123743>",
4829+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/unsafe-extern.html>",
48304830
};
48314831
}
48324832

@@ -4867,7 +4867,7 @@ declare_lint! {
48674867
"detects unsafe attributes outside of unsafe",
48684868
@future_incompatible = FutureIncompatibleInfo {
48694869
reason: FutureIncompatibilityReason::EditionError(Edition::Edition2024),
4870-
reference: "issue #123757 <https://github.com/rust-lang/rust/issues/123757>",
4870+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/unsafe-attributes.html>",
48714871
};
48724872
}
48734873

@@ -5069,7 +5069,7 @@ declare_lint! {
50695069
"Detect and warn on significant change in drop order in tail expression location",
50705070
@future_incompatible = FutureIncompatibleInfo {
50715071
reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2024),
5072-
reference: "issue #123739 <https://github.com/rust-lang/rust/issues/123739>",
5072+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>",
50735073
};
50745074
}
50755075

@@ -5108,7 +5108,7 @@ declare_lint! {
51085108
"will be parsed as a guarded string in Rust 2024",
51095109
@future_incompatible = FutureIncompatibleInfo {
51105110
reason: FutureIncompatibilityReason::EditionError(Edition::Edition2024),
5111-
reference: "issue #123735 <https://github.com/rust-lang/rust/issues/123735>",
5111+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/reserved-syntax.html>",
51125112
};
51135113
crate_level_only
51145114
}

Diff for: ‎tests/ui/drop/lint-if-let-rescope-gated.edition2021.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | if let Some(_value) = Droppy.get() {
77
| this value has a significant drop implementation which may observe a major change in drop order and requires your discretion
88
|
99
= warning: this changes meaning in Rust 2024
10-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
10+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
1111
help: the value is now dropped here in Edition 2024
1212
--> $DIR/lint-if-let-rescope-gated.rs:30:5
1313
|

Diff for: ‎tests/ui/drop/lint-if-let-rescope-with-macro.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LL | | };
1414
| |_____- in this macro invocation
1515
|
1616
= warning: this changes meaning in Rust 2024
17-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
17+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
1818
help: the value is now dropped here in Edition 2024
1919
--> $DIR/lint-if-let-rescope-with-macro.rs:12:38
2020
|

Diff for: ‎tests/ui/drop/lint-if-let-rescope.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | if let Some(_value) = droppy().get() {
77
| this value has a significant drop implementation which may observe a major change in drop order and requires your discretion
88
|
99
= warning: this changes meaning in Rust 2024
10-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
10+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
1111
help: the value is now dropped here in Edition 2024
1212
--> $DIR/lint-if-let-rescope.rs:32:5
1313
|
@@ -42,7 +42,7 @@ LL | } else if let Some(_value) = droppy().get() {
4242
| -------- this value has a significant drop implementation which may observe a major change in drop order and requires your discretion
4343
|
4444
= warning: this changes meaning in Rust 2024
45-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
45+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
4646
help: the value is now dropped here in Edition 2024
4747
--> $DIR/lint-if-let-rescope.rs:42:5
4848
|
@@ -74,7 +74,7 @@ LL | } else if let Some(_value) = droppy().get() {
7474
| this value has a significant drop implementation which may observe a major change in drop order and requires your discretion
7575
|
7676
= warning: this changes meaning in Rust 2024
77-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
77+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
7878
help: the value is now dropped here in Edition 2024
7979
--> $DIR/lint-if-let-rescope.rs:54:5
8080
|
@@ -100,7 +100,7 @@ LL | if let Some(1) = { if let Some(_value) = Droppy.get() { Some(1) } else
100100
| this value has a significant drop implementation which may observe a major change in drop order and requires your discretion
101101
|
102102
= warning: this changes meaning in Rust 2024
103-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
103+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
104104
help: the value is now dropped here in Edition 2024
105105
--> $DIR/lint-if-let-rescope.rs:58:69
106106
|
@@ -120,7 +120,7 @@ LL | if (if let Some(_value) = droppy().get() { true } else { false }) {
120120
| this value has a significant drop implementation which may observe a major change in drop order and requires your discretion
121121
|
122122
= warning: this changes meaning in Rust 2024
123-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
123+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
124124
help: the value is now dropped here in Edition 2024
125125
--> $DIR/lint-if-let-rescope.rs:72:53
126126
|
@@ -140,7 +140,7 @@ LL | } else if (((if let Some(_value) = droppy().get() { true } else { false
140140
| this value has a significant drop implementation which may observe a major change in drop order and requires your discretion
141141
|
142142
= warning: this changes meaning in Rust 2024
143-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
143+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
144144
help: the value is now dropped here in Edition 2024
145145
--> $DIR/lint-if-let-rescope.rs:78:62
146146
|
@@ -160,7 +160,7 @@ LL | while (if let Some(_value) = droppy().get() { false } else { true }) {
160160
| this value has a significant drop implementation which may observe a major change in drop order and requires your discretion
161161
|
162162
= warning: this changes meaning in Rust 2024
163-
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
163+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
164164
help: the value is now dropped here in Edition 2024
165165
--> $DIR/lint-if-let-rescope.rs:90:57
166166
|

Diff for: ‎tests/ui/drop/lint-tail-expr-drop-order.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn should_lint() -> i32 {
4545
//~| NOTE: up until Edition 2021 `#1` is dropped last but will be dropped earlier in Edition 2024
4646
//~| WARN: this changes meaning in Rust 2024
4747
//~| NOTE: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects
48-
//~| NOTE: for more information, see issue #123739
48+
//~| NOTE: for more information, see
4949
}
5050
//~^ NOTE: now the temporary value is dropped here, before the local variables in the block or statement
5151

@@ -70,7 +70,7 @@ fn should_lint_in_nested_items() {
7070
//~| NOTE: up until Edition 2021 `#1` is dropped last but will be dropped earlier in Edition 2024
7171
//~| WARN: this changes meaning in Rust 2024
7272
//~| NOTE: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects
73-
//~| NOTE: for more information, see issue #123739
73+
//~| NOTE: for more information, see
7474
}
7575
//~^ NOTE: now the temporary value is dropped here, before the local variables in the block or statement
7676
}
@@ -97,7 +97,7 @@ fn should_lint_in_nested_block() -> i32 {
9797
//~| NOTE: up until Edition 2021 `#1` is dropped last but will be dropped earlier in Edition 2024
9898
//~| WARN: this changes meaning in Rust 2024
9999
//~| NOTE: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects
100-
//~| NOTE: for more information, see issue #123739
100+
//~| NOTE: for more information, see
101101
}
102102
//~^ NOTE: now the temporary value is dropped here, before the local variables in the block or statement
103103

@@ -150,7 +150,7 @@ fn should_lint_into_async_body() -> i32 {
150150
//~| NOTE: this value will be stored in a temporary; let us call it `#1`
151151
//~| NOTE: up until Edition 2021 `#1` is dropped last but will be dropped earlier in Edition 2024
152152
//~| NOTE: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects
153-
//~| NOTE: for more information, see issue #123739
153+
//~| NOTE: for more information, see
154154
}
155155
//~^ NOTE: now the temporary value is dropped here, before the local variables in the block or statement
156156

@@ -167,7 +167,7 @@ fn should_lint_generics<T: Default>() -> &'static str {
167167
//~| NOTE: this value will be stored in a temporary; let us call it `#1`
168168
//~| NOTE: up until Edition 2021 `#1` is dropped last but will be dropped earlier in Edition 2024
169169
//~| NOTE: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects
170-
//~| NOTE: for more information, see issue #123739
170+
//~| NOTE: for more information, see
171171
}
172172
//~^ NOTE: now the temporary value is dropped here, before the local variables in the block or statement
173173

@@ -181,7 +181,7 @@ fn should_lint_adt() -> i32 {
181181
//~| NOTE: this value will be stored in a temporary; let us call it `#1`
182182
//~| NOTE: up until Edition 2021 `#1` is dropped last but will be dropped earlier in Edition 2024
183183
//~| NOTE: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects
184-
//~| NOTE: for more information, see issue #123739
184+
//~| NOTE: for more information, see
185185
}
186186
//~^ NOTE: now the temporary value is dropped here, before the local variables in the block or statement
187187

@@ -225,7 +225,7 @@ fn should_lint_with_dtor_span() -> i32 {
225225
//~| NOTE: up until Edition 2021 `#1` is dropped last but will be dropped earlier in Edition 2024
226226
//~| WARN: this changes meaning in Rust 2024
227227
//~| NOTE: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects
228-
//~| NOTE: for more information, see issue #123739
228+
//~| NOTE: for more information, see
229229
}
230230
//~^ NOTE: now the temporary value is dropped here, before the local variables in the block or statement
231231

@@ -238,7 +238,7 @@ fn should_lint_with_transient_drops() {
238238
//~| NOTE: up until Edition 2021 `#1` is dropped last but will be dropped earlier in Edition 2024
239239
//~| WARN: this changes meaning in Rust 2024
240240
//~| NOTE: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects
241-
//~| NOTE: for more information, see issue #123739
241+
//~| NOTE: for more information, see
242242
},
243243
{
244244
let _x = LoudDropper;

Diff for: ‎tests/ui/drop/lint-tail-expr-drop-order.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LL | }
1717
| - now the temporary value is dropped here, before the local variables in the block or statement
1818
|
1919
= warning: this changes meaning in Rust 2024
20-
= note: for more information, see issue #123739 <https://github.com/rust-lang/rust/issues/123739>
20+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
2121
note: `#1` invokes this custom destructor
2222
--> $DIR/lint-tail-expr-drop-order.rs:11:1
2323
|
@@ -58,7 +58,7 @@ LL | }
5858
| - now the temporary value is dropped here, before the local variables in the block or statement
5959
|
6060
= warning: this changes meaning in Rust 2024
61-
= note: for more information, see issue #123739 <https://github.com/rust-lang/rust/issues/123739>
61+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
6262
note: `#1` invokes this custom destructor
6363
--> $DIR/lint-tail-expr-drop-order.rs:11:1
6464
|
@@ -94,7 +94,7 @@ LL | }
9494
| - now the temporary value is dropped here, before the local variables in the block or statement
9595
|
9696
= warning: this changes meaning in Rust 2024
97-
= note: for more information, see issue #123739 <https://github.com/rust-lang/rust/issues/123739>
97+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
9898
note: `#1` invokes this custom destructor
9999
--> $DIR/lint-tail-expr-drop-order.rs:11:1
100100
|
@@ -130,7 +130,7 @@ LL | }
130130
| - now the temporary value is dropped here, before the local variables in the block or statement
131131
|
132132
= warning: this changes meaning in Rust 2024
133-
= note: for more information, see issue #123739 <https://github.com/rust-lang/rust/issues/123739>
133+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
134134
note: `#1` invokes this custom destructor
135135
--> $DIR/lint-tail-expr-drop-order.rs:11:1
136136
|
@@ -166,7 +166,7 @@ LL | }
166166
| - now the temporary value is dropped here, before the local variables in the block or statement
167167
|
168168
= warning: this changes meaning in Rust 2024
169-
= note: for more information, see issue #123739 <https://github.com/rust-lang/rust/issues/123739>
169+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
170170
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
171171

172172
error: relative drop order changing in Rust 2024
@@ -188,7 +188,7 @@ LL | }
188188
| - now the temporary value is dropped here, before the local variables in the block or statement
189189
|
190190
= warning: this changes meaning in Rust 2024
191-
= note: for more information, see issue #123739 <https://github.com/rust-lang/rust/issues/123739>
191+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
192192
note: `#1` invokes this custom destructor
193193
--> $DIR/lint-tail-expr-drop-order.rs:11:1
194194
|
@@ -224,7 +224,7 @@ LL | }
224224
| - now the temporary value is dropped here, before the local variables in the block or statement
225225
|
226226
= warning: this changes meaning in Rust 2024
227-
= note: for more information, see issue #123739 <https://github.com/rust-lang/rust/issues/123739>
227+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
228228
note: `#1` invokes this custom destructor
229229
--> $DIR/lint-tail-expr-drop-order.rs:195:5
230230
|
@@ -266,7 +266,7 @@ LL | ));
266266
| - now the temporary value is dropped here, before the local variables in the block or statement
267267
|
268268
= warning: this changes meaning in Rust 2024
269-
= note: for more information, see issue #123739 <https://github.com/rust-lang/rust/issues/123739>
269+
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
270270
note: `#1` invokes this custom destructor
271271
--> $DIR/lint-tail-expr-drop-order.rs:11:1
272272
|

0 commit comments

Comments
 (0)