diff options
| author | bors <bors@rust-lang.org> | 2025-04-28 17:22:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-28 17:22:11 +0000 |
| commit | 25cdf1f67463c9365d8d83778c933ec7480e940b (patch) | |
| tree | 3692f9b718b4427606d5f966f253b81328268486 /compiler/rustc_privacy/src/lib.rs | |
| parent | 7d65abfe80f9eee93296d1ce08f845c9bf7039f8 (diff) | |
| parent | dd3ca71b4e63a2eb167b37879abb2830af45a0b3 (diff) | |
| download | rust-25cdf1f67463c9365d8d83778c933ec7480e940b.tar.gz rust-25cdf1f67463c9365d8d83778c933ec7480e940b.zip | |
Auto merge of #140388 - GuillaumeGomez:rollup-aj9o3ch, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #140056 (Fix a wrong error message in 2024 edition) - #140220 (Fix detection of main function if there are expressions around it) - #140249 (Remove `weak` alias terminology) - #140316 (Introduce `BoxMarker` to improve pretty-printing correctness) - #140347 (ci: clean more disk space in codebuild) - #140349 (ci: use aws codebuild for the `dist-x86_64-linux` job) - #140379 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_privacy/src/lib.rs')
| -rw-r--r-- | compiler/rustc_privacy/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_privacy/src/lib.rs b/compiler/rustc_privacy/src/lib.rs index b56f3e1971c..a3b479fdb7a 100644 --- a/compiler/rustc_privacy/src/lib.rs +++ b/compiler/rustc_privacy/src/lib.rs @@ -213,7 +213,7 @@ where } } } - ty::Alias(kind @ (ty::Inherent | ty::Weak | ty::Projection), data) => { + ty::Alias(kind @ (ty::Inherent | ty::Free | ty::Projection), data) => { if self.def_id_visitor.skip_assoc_tys() { // Visitors searching for minimal visibility/reachability want to // conservatively approximate associated types like `Type::Alias` @@ -227,7 +227,7 @@ where data.def_id, match kind { ty::Inherent | ty::Projection => "associated type", - ty::Weak => "type alias", + ty::Free => "type alias", ty::Opaque => unreachable!(), }, &LazyDefPathStr { def_id: data.def_id, tcx }, |