about summary refs log tree commit diff
path: root/src/librustc_span
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2020-07-15 11:01:20 -0700
committerGitHub <noreply@github.com>2020-07-15 11:01:20 -0700
commit47f6a9d797e5d0a6e35fac2a903f47ad65bb4c4a (patch)
tree9ff14cd7f738cadcb096deb1d49989b0d83c45d6 /src/librustc_span
parent0d07db98ab5870c269493cb9fba9376b9477d4b4 (diff)
parentfcf52c167f9280efe332557195998650a99bf437 (diff)
downloadrust-47f6a9d797e5d0a6e35fac2a903f47ad65bb4c4a.tar.gz
rust-47f6a9d797e5d0a6e35fac2a903f47ad65bb4c4a.zip
Rollup merge of #74276 - lcnr:discriminant-kind-what, r=nagisa
improve DiscriminantKind handling

Adds a lang item `discriminant_type` for the associated type `DiscriminantKind::Discriminant`.

Changes the discriminant of generators from `i32` to `u32`, which should not be observable to fix an
oversight where MIR was using `u32` and codegen and typeck used `i32`.
Diffstat (limited to 'src/librustc_span')
-rw-r--r--src/librustc_span/symbol.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_span/symbol.rs b/src/librustc_span/symbol.rs
index 8b93b8a7aa7..d7651879a8a 100644
--- a/src/librustc_span/symbol.rs
+++ b/src/librustc_span/symbol.rs
@@ -327,6 +327,7 @@ symbols! {
         diagnostic,
         direct,
         discriminant_kind,
+        discriminant_type,
         discriminant_value,
         dispatch_from_dyn,
         div,