Fix pretty print tests

Also add a check that the API works as expected for drivers calling
name on an std enum.

Author: celinval

compiler/rustc_public/src/ty.rs

@@ -876,6 +876,9 @@ pub struct VariantDef {
 }
 
 impl VariantDef {
+    /// The name of the variant, struct or union.
+    ///
+    /// This will not include the name of the enum or qualified path.
     pub fn name(&self) -> Symbol {
         with(|cx| cx.variant_name(*self))
     }

tests/ui-fulldeps/rustc_public/check_def_ty.rs

@@ -15,9 +15,12 @@ extern crate rustc_middle;
 extern crate rustc_driver;
 extern crate rustc_interface;
 extern crate rustc_public;
+extern crate rustc_public_bridge;
 
-use rustc_public::ty::{ForeignItemKind, Ty};
+use rustc_public::ty::VariantIdx;
+use rustc_public::ty::{ForeignItemKind, RigidTy, Ty};
 use rustc_public::*;
+use rustc_public_bridge::IndexedVal;
 use std::io::Write;
 use std::ops::ControlFlow;
 
@@ -32,6 +35,14 @@ fn test_def_tys() -> ControlFlow<()> {
         match item.trimmed_name().as_str() {
             "STATIC_STR" => assert!(ty.kind().is_ref()),
             "CONST_U32" => assert!(ty.kind().is_integral()),
+            "NONE" => {
+                let RigidTy::Adt(adt, _) = *ty.kind().rigid().unwrap() else { panic!() };
+                // Definition names include the entire path.
+                assert_eq!(adt.name(), "std::option::Option");
+                // Variant name only includes the actual variant name.
+                // I know, probably not the best name schema. o.O
+                assert_eq!(adt.variant(VariantIdx::to_val(0)).unwrap().name(), "None");
+            }
             "main" => check_fn_def(ty),
             _ => unreachable!("Unexpected item: `{item:?}`"),
         }
@@ -92,6 +103,7 @@ fn generate_input(path: &str) -> std::io::Result<()> {
         r#"
         static STATIC_STR: &str = "foo";
         const CONST_U32: u32 = 0u32;
+        static NONE: Option<i32> = Option::None;
 
         fn main() {{
             let _c = core::char::from_u32(99);

tests/ui/rustc_public-ir-print/async-closure.stdout

@@ -56,7 +56,7 @@ fn foo::{closure#0}::{closure#0}(_1: Pin<&mut {async closure body@$DIR/async-clo
         _3 = (*_4);
         _5 = ();
         StorageDead(_3);
-        _0 = std::task::Poll::Ready(move _5);
+        _0 = Poll::Ready(move _5);
         discriminant((*_7)) = 1;
         return;
     }
@@ -88,7 +88,7 @@ fn foo::{closure#0}::{synthetic#0}(_1: Pin<&mut {async closure body@$DIR/async-c
         _3 = (*_4);
         _5 = ();
         StorageDead(_3);
-        _0 = std::task::Poll::Ready(move _5);
+        _0 = Poll::Ready(move _5);
         discriminant((*_7)) = 1;
         return;
     }

tests/ui/rustc_public-ir-print/operands.stdout

@@ -219,7 +219,7 @@ fn operands(_1: u8) -> () {
         _27 = &(*_16);
         _26 = &(*_27);
         StorageLive(_28);
-        _28 = std::option::Option::None;
+        _28 = Option::None;
         _22 = core::panicking::assert_failed::<u8, u8>(move _23, move _24, move _26, move _28) -> unwind unreachable;
     }
     bb6: {
@@ -281,7 +281,7 @@ fn operands(_1: u8) -> () {
         _47 = &(*_36);
         _46 = &(*_47);
         StorageLive(_48);
-        _48 = std::option::Option::None;
+        _48 = Option::None;
         _42 = core::panicking::assert_failed::<u8, u8>(move _43, move _44, move _46, move _48) -> unwind unreachable;
     }
     bb8: {
@@ -318,7 +318,7 @@ fn operands(_1: u8) -> () {
         _70 = &(*_59);
         _69 = &(*_70);
         StorageLive(_71);
-        _71 = std::option::Option::None;
+        _71 = Option::None;
         _65 = core::panicking::assert_failed::<u8, u8>(move _66, move _67, move _69, move _71) -> unwind unreachable;
     }
     bb10: {
@@ -393,7 +393,7 @@ fn operands(_1: u8) -> () {
         _94 = &(*_83);
         _93 = &(*_94);
         StorageLive(_95);
-        _95 = std::option::Option::None;
+        _95 = Option::None;
         _89 = core::panicking::assert_failed::<usize, usize>(move _90, move _91, move _93, move _95) -> unwind unreachable;
     }
 }