From 764dc3dc2f8a2a421fa9d9c6144ad75310a26b99 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Tue, 4 Aug 2020 10:27:35 +0100
Subject: [PATCH] lang_items: add support for lang items on variants

This commit adds support for lang items (`#[lang = "..."]` attributes)
on enum variants.

Signed-off-by: David Wood <david@davidtw.co>
---
 src/librustc_hir/target.rs        | 2 ++
 src/librustc_passes/lang_items.rs | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/librustc_hir/target.rs b/src/librustc_hir/target.rs
index 3a4485a1b17fd..1efc8bc3124b6 100644
--- a/src/librustc_hir/target.rs
+++ b/src/librustc_hir/target.rs
@@ -29,6 +29,7 @@ pub enum Target {
     TyAlias,
     OpaqueTy,
     Enum,
+    Variant,
     Struct,
     Union,
     Trait,
@@ -62,6 +63,7 @@ impl Display for Target {
                 Target::TyAlias => "type alias",
                 Target::OpaqueTy => "opaque type",
                 Target::Enum => "enum",
+                Target::Variant => "enum variant",
                 Target::Struct => "struct",
                 Target::Union => "union",
                 Target::Trait => "trait",
diff --git a/src/librustc_passes/lang_items.rs b/src/librustc_passes/lang_items.rs
index 07415870549f1..9ec47d2d9ab5c 100644
--- a/src/librustc_passes/lang_items.rs
+++ b/src/librustc_passes/lang_items.rs
@@ -30,7 +30,13 @@ struct LanguageItemCollector<'tcx> {
 
 impl ItemLikeVisitor<'v> for LanguageItemCollector<'tcx> {
     fn visit_item(&mut self, item: &hir::Item<'_>) {
-        self.check_for_lang(Target::from_item(item), item.hir_id, item.attrs)
+        self.check_for_lang(Target::from_item(item), item.hir_id, item.attrs);
+
+        if let hir::ItemKind::Enum(def, ..) = &item.kind {
+            for variant in def.variants {
+                self.check_for_lang(Target::Variant, variant.id, variant.attrs);
+            }
+        }
     }
 
     fn visit_trait_item(&mut self, trait_item: &hir::TraitItem<'_>) {