Skip to content

Commit ec1f5e3

Browse files
celinvalcelinval
committed
Fix name and pretty print now uses trimmed_name
1 parent 8072264 commit ec1f5e3

File tree

7 files changed

+46
-29
lines changed

7 files changed

+46
-29
lines changed

‎compiler/rustc_public/src/mir/pretty.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ fn pretty_aggregate<W: Write>(
412412
}
413413
AggregateKind::Adt(def, var, _, _, _) => {
414414
if def.kind() == AdtKind::Enum {
415-
write!(writer, "{}::{}", def.name(), def.variant(*var).unwrap().name())?;
415+
write!(writer, "{}::{}", def.trimmed_name(), def.variant(*var).unwrap().name())?;
416416
} else {
417417
write!(writer, "{}", def.variant(*var).unwrap().name())?;
418418
}

‎compiler/rustc_public/src/ty.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -876,6 +876,9 @@ pub struct VariantDef {
876876
}
877877

878878
impl VariantDef {
879+
/// The name of the variant, struct or union.
880+
///
881+
/// This will not include the name of the enum or qualified path.
879882
pub fn name(&self) -> Symbol {
880883
with(|cx| cx.variant_name(*self))
881884
}

‎compiler/rustc_public_bridge/src/context/impls.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ use rustc_hir::{Attribute, LangItem};
1010
use rustc_middle::mir::interpret::{AllocId, ConstAllocation, ErrorHandled, GlobalAlloc, Scalar};
1111
use rustc_middle::mir::{BinOp, Body, Const as MirConst, ConstValue, UnOp};
1212
use rustc_middle::ty::layout::{FnAbiOf, LayoutOf};
13-
use rustc_middle::ty::print::{with_forced_trimmed_paths, with_resolve_crate_name};
13+
use rustc_middle::ty::print::{
14+
with_forced_trimmed_paths, with_no_trimmed_paths, with_resolve_crate_name,
15+
};
1416
use rustc_middle::ty::util::Discr;
1517
use rustc_middle::ty::{
1618
AdtDef, AdtKind, AssocItem, Binder, ClosureKind, CoroutineArgsExt, EarlyBinder,
@@ -265,7 +267,7 @@ impl<'tcx, B: Bridge> CompilerCtxt<'tcx, B> {
265267
with_forced_trimmed_paths!(self.tcx.def_path_str(def_id))
266268
} else {
267269
// For local definitions, we need to prepend with crate name.
268-
with_resolve_crate_name!(self.tcx.def_path_str(def_id))
270+
with_resolve_crate_name!(with_no_trimmed_paths!(self.tcx.def_path_str(def_id)))
269271
}
270272
}
271273

@@ -720,9 +722,9 @@ impl<'tcx, B: Bridge> CompilerCtxt<'tcx, B> {
720722
self.tcx.def_path_str_with_args(instance.def_id(), instance.args)
721723
)
722724
} else {
723-
with_resolve_crate_name!(
725+
with_resolve_crate_name!(with_no_trimmed_paths!(
724726
self.tcx.def_path_str_with_args(instance.def_id(), instance.args)
725-
)
727+
))
726728
}
727729
}
728730

‎tests/ui-fulldeps/rustc_public/check_def_ty.rs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ extern crate rustc_middle;
1515
extern crate rustc_driver;
1616
extern crate rustc_interface;
1717
extern crate rustc_public;
18+
extern crate rustc_public_bridge;
1819

19-
use rustc_public::ty::{ForeignItemKind, Ty};
20+
use rustc_public::ty::VariantIdx;
21+
use rustc_public::ty::{ForeignItemKind, RigidTy, Ty};
2022
use rustc_public::*;
23+
use rustc_public_bridge::IndexedVal;
2124
use std::io::Write;
2225
use std::ops::ControlFlow;
2326

@@ -32,6 +35,14 @@ fn test_def_tys() -> ControlFlow<()> {
3235
match item.trimmed_name().as_str() {
3336
"STATIC_STR" => assert!(ty.kind().is_ref()),
3437
"CONST_U32" => assert!(ty.kind().is_integral()),
38+
"NONE" => {
39+
let RigidTy::Adt(adt, _) = *ty.kind().rigid().unwrap() else { panic!() };
40+
// Definition names include the entire path.
41+
assert_eq!(adt.name(), "std::option::Option");
42+
// Variant name only includes the actual variant name.
43+
// I know, probably not the best name schema. o.O
44+
assert_eq!(adt.variant(VariantIdx::to_val(0)).unwrap().name(), "None");
45+
}
3546
"main" => check_fn_def(ty),
3647
_ => unreachable!("Unexpected item: `{item:?}`"),
3748
}
@@ -92,6 +103,7 @@ fn generate_input(path: &str) -> std::io::Result<()> {
92103
r#"
93104
static STATIC_STR: &str = "foo";
94105
const CONST_U32: u32 = 0u32;
106+
static NONE: Option<i32> = Option::None;
95107
96108
fn main() {{
97109
let _c = core::char::from_u32(99);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// WARNING: This is highly experimental output it's intended for rustc_public developers only.
22
// If you find a bug or want to improve the output open a issue at https://github.com/rust-lang/project-stable-mir.
3-
fn foo() -> () {
3+
fn async_closure::foo() -> () {
44
let mut _0: ();
55
let _1: i32;
66
let _2: {async closure@$DIR/async-closure.rs:9:13: 9:21};
@@ -21,7 +21,7 @@ fn foo() -> () {
2121
return;
2222
}
2323
}
24-
fn foo::{closure#0}(_1: &{async closure@$DIR/async-closure.rs:9:13: 9:21}) -> {async closure body@$DIR/async-closure.rs:9:22: 11:6} {
24+
fn async_closure::foo::{closure#0}(_1: &{async closure@$DIR/async-closure.rs:9:13: 9:21}) -> {async closure body@$DIR/async-closure.rs:9:22: 11:6} {
2525
let mut _0: {async closure body@$DIR/async-closure.rs:9:22: 11:6};
2626
let mut _2: &i32;
2727
let mut _3: &i32;
@@ -35,7 +35,7 @@ fn foo::{closure#0}(_1: &{async closure@$DIR/async-closure.rs:9:13: 9:21}) -> {a
3535
return;
3636
}
3737
}
38-
fn foo::{closure#0}::{closure#0}(_1: Pin<&mut {async closure body@$DIR/async-closure.rs:9:22: 11:6}>, _2: &mut Context<'_>) -> Poll<()> {
38+
fn async_closure::foo::{closure#0}::{closure#0}(_1: Pin<&mut {async closure body@$DIR/async-closure.rs:9:22: 11:6}>, _2: &mut Context<'_>) -> Poll<()> {
3939
let mut _0: Poll<()>;
4040
let _3: i32;
4141
let mut _4: &i32;
@@ -56,7 +56,7 @@ fn foo::{closure#0}::{closure#0}(_1: Pin<&mut {async closure body@$DIR/async-clo
5656
_3 = (*_4);
5757
_5 = ();
5858
StorageDead(_3);
59-
_0 = std::task::Poll::Ready(move _5);
59+
_0 = Poll::Ready(move _5);
6060
discriminant((*_7)) = 1;
6161
return;
6262
}
@@ -67,7 +67,7 @@ fn foo::{closure#0}::{closure#0}(_1: Pin<&mut {async closure body@$DIR/async-clo
6767
unreachable;
6868
}
6969
}
70-
fn foo::{closure#0}::{synthetic#0}(_1: Pin<&mut {async closure body@$DIR/async-closure.rs:9:22: 11:6}>, _2: &mut Context<'_>) -> Poll<()> {
70+
fn async_closure::foo::{closure#0}::{synthetic#0}(_1: Pin<&mut {async closure body@$DIR/async-closure.rs:9:22: 11:6}>, _2: &mut Context<'_>) -> Poll<()> {
7171
let mut _0: Poll<()>;
7272
let _3: i32;
7373
let mut _4: &i32;
@@ -88,7 +88,7 @@ fn foo::{closure#0}::{synthetic#0}(_1: Pin<&mut {async closure body@$DIR/async-c
8888
_3 = (*_4);
8989
_5 = ();
9090
StorageDead(_3);
91-
_0 = std::task::Poll::Ready(move _5);
91+
_0 = Poll::Ready(move _5);
9292
discriminant((*_7)) = 1;
9393
return;
9494
}

‎tests/ui/rustc_public-ir-print/basic_function.stdout‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// WARNING: This is highly experimental output it's intended for rustc_public developers only.
22
// If you find a bug or want to improve the output open a issue at https://github.com/rust-lang/project-stable-mir.
3-
fn foo(_1: i32) -> i32 {
3+
fn basic_function::foo(_1: i32) -> i32 {
44
let mut _0: i32;
55
let mut _2: i32;
66
let mut _3: (i32, bool);
@@ -17,7 +17,7 @@ fn foo(_1: i32) -> i32 {
1717
return;
1818
}
1919
}
20-
fn bar(_1: &mut Vec<i32>) -> Vec<i32> {
20+
fn basic_function::bar(_1: &mut Vec<i32>) -> Vec<i32> {
2121
let mut _0: Vec<i32>;
2222
let mut _2: Vec<i32>;
2323
let mut _3: &Vec<i32>;
@@ -52,7 +52,7 @@ fn bar(_1: &mut Vec<i32>) -> Vec<i32> {
5252
resume;
5353
}
5454
}
55-
fn demux(_1: u8) -> u8 {
55+
fn basic_function::demux(_1: u8) -> u8 {
5656
let mut _0: u8;
5757
debug input => _1;
5858
bb0: {
@@ -78,7 +78,7 @@ fn demux(_1: u8) -> u8 {
7878
return;
7979
}
8080
}
81-
fn main() -> () {
81+
fn basic_function::main() -> () {
8282
let mut _0: ();
8383
bb0: {
8484
_0 = ();

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// WARNING: This is highly experimental output it's intended for rustc_public developers only.
22
// If you find a bug or want to improve the output open a issue at https://github.com/rust-lang/project-stable-mir.
3-
fn operands(_1: u8) -> () {
3+
fn operands::operands(_1: u8) -> () {
44
let mut _0: ();
55
let _2: [u8; 10];
66
let mut _3: u8;
@@ -206,7 +206,7 @@ fn operands(_1: u8) -> () {
206206
StorageDead(_19);
207207
StorageDead(_18);
208208
StorageLive(_21);
209-
_21 = core::panicking::AssertKind::Eq;
209+
_21 = AssertKind::Eq;
210210
StorageLive(_22);
211211
StorageLive(_23);
212212
_23 = move _21;
@@ -219,7 +219,7 @@ fn operands(_1: u8) -> () {
219219
_27 = &(*_16);
220220
_26 = &(*_27);
221221
StorageLive(_28);
222-
_28 = std::option::Option::None;
222+
_28 = Option::None;
223223
_22 = core::panicking::assert_failed::<u8, u8>(move _23, move _24, move _26, move _28) -> unwind unreachable;
224224
}
225225
bb6: {
@@ -268,7 +268,7 @@ fn operands(_1: u8) -> () {
268268
StorageDead(_39);
269269
StorageDead(_38);
270270
StorageLive(_41);
271-
_41 = core::panicking::AssertKind::Eq;
271+
_41 = AssertKind::Eq;
272272
StorageLive(_42);
273273
StorageLive(_43);
274274
_43 = move _41;
@@ -281,7 +281,7 @@ fn operands(_1: u8) -> () {
281281
_47 = &(*_36);
282282
_46 = &(*_47);
283283
StorageLive(_48);
284-
_48 = std::option::Option::None;
284+
_48 = Option::None;
285285
_42 = core::panicking::assert_failed::<u8, u8>(move _43, move _44, move _46, move _48) -> unwind unreachable;
286286
}
287287
bb8: {
@@ -305,7 +305,7 @@ fn operands(_1: u8) -> () {
305305
StorageDead(_62);
306306
StorageDead(_61);
307307
StorageLive(_64);
308-
_64 = core::panicking::AssertKind::Eq;
308+
_64 = AssertKind::Eq;
309309
StorageLive(_65);
310310
StorageLive(_66);
311311
_66 = move _64;
@@ -318,7 +318,7 @@ fn operands(_1: u8) -> () {
318318
_70 = &(*_59);
319319
_69 = &(*_70);
320320
StorageLive(_71);
321-
_71 = std::option::Option::None;
321+
_71 = Option::None;
322322
_65 = core::panicking::assert_failed::<u8, u8>(move _66, move _67, move _69, move _71) -> unwind unreachable;
323323
}
324324
bb10: {
@@ -380,7 +380,7 @@ fn operands(_1: u8) -> () {
380380
StorageDead(_86);
381381
StorageDead(_85);
382382
StorageLive(_88);
383-
_88 = core::panicking::AssertKind::Eq;
383+
_88 = AssertKind::Eq;
384384
StorageLive(_89);
385385
StorageLive(_90);
386386
_90 = move _88;
@@ -393,11 +393,11 @@ fn operands(_1: u8) -> () {
393393
_94 = &(*_83);
394394
_93 = &(*_94);
395395
StorageLive(_95);
396-
_95 = std::option::Option::None;
396+
_95 = Option::None;
397397
_89 = core::panicking::assert_failed::<usize, usize>(move _90, move _91, move _93, move _95) -> unwind unreachable;
398398
}
399399
}
400-
fn more_operands() -> [Ctors; 3] {
400+
fn operands::more_operands() -> [Ctors; 3] {
401401
let mut _0: [Ctors; 3];
402402
let _1: Dummy;
403403
let _2: Ctors;
@@ -440,7 +440,7 @@ fn more_operands() -> [Ctors; 3] {
440440
return;
441441
}
442442
}
443-
fn closures(_1: bool, _2: bool) -> {closure@$DIR/operands.rs:47:5: 47:19} {
443+
fn operands::closures(_1: bool, _2: bool) -> {closure@$DIR/operands.rs:47:5: 47:19} {
444444
let mut _0: {closure@$DIR/operands.rs:47:5: 47:19};
445445
debug x => _1;
446446
debug z => _2;
@@ -449,7 +449,7 @@ fn closures(_1: bool, _2: bool) -> {closure@$DIR/operands.rs:47:5: 47:19} {
449449
return;
450450
}
451451
}
452-
fn closures::{closure#0}(_1: {closure@$DIR/operands.rs:47:5: 47:19}, _2: bool) -> bool {
452+
fn operands::closures::{closure#0}(_1: {closure@$DIR/operands.rs:47:5: 47:19}, _2: bool) -> bool {
453453
let mut _0: bool;
454454
let mut _3: bool;
455455
let mut _4: bool;
@@ -483,7 +483,7 @@ fn closures::{closure#0}(_1: {closure@$DIR/operands.rs:47:5: 47:19}, _2: bool) -
483483
return;
484484
}
485485
}
486-
fn Ctors::TupLike(_1: bool) -> Ctors {
486+
fn operands::Ctors::TupLike(_1: bool) -> Ctors {
487487
let mut _0: Ctors;
488488
bb0: {
489489
_0 = Ctors::TupLike(move _1);

0 commit comments

Comments
 (0)