Only include lint in future_incompatible lint group if not an edition lint

2021-06-24 16:29:03 +02:00
parent 451e98e7b0
commit 0e28575909
3 changed files with 42 additions and 21 deletions
--- a/compiler/rustc_lint/src/context.rs
+++ b/compiler/rustc_lint/src/context.rs
@@ -220,17 +220,17 @@ impl LintStore {
                        })
                        .lint_ids
                        .push(id);
+                } else {
+                    self.lint_groups
+                        .entry("future_incompatible")
+                        .or_insert(LintGroup {
+                            lint_ids: vec![],
+                            from_plugin: lint.is_plugin,
+                            depr: None,
+                        })
+                        .lint_ids
+                        .push(id);
                }
-
-                self.lint_groups
-                    .entry("future_incompatible")
-                    .or_insert(LintGroup {
-                        lint_ids: vec![],
-                        from_plugin: lint.is_plugin,
-                        depr: None,
-                    })
-                    .lint_ids
-                    .push(id);
            }
        }
    }