diff options
| author | bors <bors@rust-lang.org> | 2024-12-11 15:31:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-11 15:31:52 +0000 |
| commit | 1f3bf231e160b9869e2a85260fd6805304bfcee2 (patch) | |
| tree | dab4eb4699fd3536811549fb2289a2609ec92298 /compiler/rustc_middle/src | |
| parent | 5a6036a1802262f8cf02192b02026688d396f1d7 (diff) | |
| parent | c384b28148cd85f71779aa8025660b9c5b6c3d26 (diff) | |
| download | rust-1f3bf231e160b9869e2a85260fd6805304bfcee2.tar.gz rust-1f3bf231e160b9869e2a85260fd6805304bfcee2.zip | |
Auto merge of #134164 - jhpratt:rollup-s7z0vcc, r=jhpratt
Rollup of 8 pull requests
Successful merges:
- #134079 (Add a note saying that `{u8,i8}::from_{be,le,ne}_bytes` is meaningless)
- #134105 (Validate self in host predicates correctly)
- #134136 (Exercise const trait interaction with default fields)
- #134139 ([AIX] keep profile-rt symbol alive)
- #134141 (Remove more traces of anonymous ADTs)
- #134142 (Rudimentary heuristic to insert parentheses when needed for RPIT overcaptures lint)
- #134158 (Rename `projection_def_id` to `item_def_id`)
- #134160 (Add vacation entry for myself in triagebot.toml)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/ty/print/pretty.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_middle/src/ty/print/pretty.rs b/compiler/rustc_middle/src/ty/print/pretty.rs index cd4123f0a3f..40e0fb0087f 100644 --- a/compiler/rustc_middle/src/ty/print/pretty.rs +++ b/compiler/rustc_middle/src/ty/print/pretty.rs @@ -1020,7 +1020,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write { self.insert_trait_and_projection( trait_ref, - Some((proj.projection_def_id(), proj.term())), + Some((proj.item_def_id(), proj.term())), &mut traits, &mut fn_traits, ); |