Skip to content

Commit 0d7f236

Browse files
committedJun 25, 2021
Auto merge of #86627 - JohnTitor:rollup-ey29pc1, r=JohnTitor
Rollup of 5 pull requests Successful merges: - #86330 (Change how edition based future compatibility warnings are handled) - #86513 (Rustdoc: Do not list impl when trait has doc(hidden)) - #86592 (Use `#[non_exhaustive]` where appropriate) - #86608 (chore(rustdoc): remove unused members of RenderType) - #86624 (Update compiler-builtins) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents f726dbe + b238e6f commit 0d7f236

File tree

130 files changed

+608
-733
lines changed

Some content is hidden

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

130 files changed

+608
-733
lines changed
 

‎Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -656,9 +656,9 @@ dependencies = [
656656

657657
[[package]]
658658
name = "compiler_builtins"
659-
version = "0.1.45"
659+
version = "0.1.46"
660660
source = "registry+https://github.com/rust-lang/crates.io-index"
661-
checksum = "787187ae221adfcda34b03006f1617099e4ae26b50e5a4db282496014ab75837"
661+
checksum = "d69484e04eab372f5f345920e3a8c7a06e7dcbb75c0944eccdc3e3160aeee3c7"
662662
dependencies = [
663663
"cc",
664664
"rustc-std-workspace-core",

‎compiler/rustc_lint/src/array_into_iter.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ use rustc_errors::Applicability;
33
use rustc_hir as hir;
44
use rustc_middle::ty;
55
use rustc_middle::ty::adjustment::{Adjust, Adjustment};
6-
use rustc_session::lint::FutureBreakage;
6+
use rustc_session::lint::FutureIncompatibilityReason;
7+
use rustc_span::edition::Edition;
78
use rustc_span::symbol::sym;
89

910
declare_lint! {
@@ -37,10 +38,7 @@ declare_lint! {
3738
"detects calling `into_iter` on arrays",
3839
@future_incompatible = FutureIncompatibleInfo {
3940
reference: "issue #66145 <https://github.com/rust-lang/rust/issues/66145>",
40-
edition: None,
41-
future_breakage: Some(FutureBreakage {
42-
date: None
43-
})
41+
reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2021),
4442
};
4543
}
4644

0 commit comments

Comments
 (0)