Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 9 pull requests #109513

Closed
wants to merge 27 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f28f77f
resolve: Remove `item_generics_num_lifetimes`
petrochenkov Feb 21, 2023
d99e01f
resolve: Remove `item_attrs_untracked`
petrochenkov Feb 21, 2023
52c7397
resolve: Use `item_name` and `opt_parent` in `Resolver::get_module`
petrochenkov Mar 14, 2023
18b59f5
resolve: Minor cleanup to `Resolver::get_module`
petrochenkov Mar 14, 2023
009ed88
Add `known-bug` test for typeid unsoundness issue
Randl Mar 20, 2023
7c2ee33
Refine error spans for const args in hir typeck
compiler-errors Mar 9, 2023
2e7472f
Note type mismatch on ConstArgHasType
compiler-errors Mar 9, 2023
86a0334
Don't skip all directories when tidy-checking
WaffleLapkin Mar 21, 2023
285fec8
Remove useless Clone bounds
WaffleLapkin Mar 21, 2023
ec25f08
Demonstration test for MIR building of checked shift operators
scottmcm Mar 22, 2023
b537e6b
Generate simpler MIR for shifts
scottmcm Mar 22, 2023
e8be3d2
Stabilize `arc_into_inner` and `rc_into_inner`.
steffahn Mar 14, 2023
3f7aeb3
make param bound vars visibly bound vars
BoxyUwU Mar 23, 2023
5dc3fd7
Include relation direction in AliasEq predicate
compiler-errors Mar 21, 2023
3a36a09
Rename AliasEq -> AliasRelate
compiler-errors Mar 21, 2023
f6fd754
Printing alias-relate goals correctly
compiler-errors Mar 21, 2023
244cdaa
Remove AliasRelationDirection::Supertype
compiler-errors Mar 22, 2023
e5189cc
Nested impl traits trigger opaque_hidden_inferred_bound too much
compiler-errors Feb 27, 2023
c2c2836
Rollup merge of #108541 - compiler-errors:lol-nested-rpits, r=oli-obk
matthiaskrgr Mar 23, 2023
7d4bee3
Rollup merge of #108961 - compiler-errors:refine-ct-errors, r=BoxyUwU
matthiaskrgr Mar 23, 2023
c0769d9
Rollup merge of #109137 - petrochenkov:qcstore2, r=cjgillot
matthiaskrgr Mar 23, 2023
9270847
Rollup merge of #109380 - Randl:patch-1, r=oli-obk
matthiaskrgr Mar 23, 2023
13564c0
Rollup merge of #109440 - WaffleLapkin:make_tidy_slower, r=jyn514,ozk…
matthiaskrgr Mar 23, 2023
c2eb896
Rollup merge of #109462 - compiler-errors:alias-relate, r=BoxyUwU,lcnr
matthiaskrgr Mar 23, 2023
43ebbff
Rollup merge of #109475 - scottmcm:simpler-shifts, r=WaffleLapkin
matthiaskrgr Mar 23, 2023
1780edf
Rollup merge of #109504 - steffahn:stabilize_a_rc_into_inner, r=josht…
matthiaskrgr Mar 23, 2023
8a43143
Rollup merge of #109506 - BoxyUwU:debugable_bound_var_printing, r=com…
matthiaskrgr Mar 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Printing alias-relate goals correctly
compiler-errors committed Mar 23, 2023

Verified

This commit was signed with the committer’s verified signature.
flip1995 Philipp Krones
commit f6fd7546804dd25d4996196dbc9653bde2b4a131
10 changes: 10 additions & 0 deletions compiler/rustc_middle/src/ty/mod.rs
Original file line number Diff line number Diff line change
@@ -661,6 +661,16 @@ impl AliasRelationDirection {
}
}

impl std::fmt::Display for AliasRelationDirection {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
AliasRelationDirection::Equate => write!(f, " == "),
AliasRelationDirection::Subtype => write!(f, " <: "),
AliasRelationDirection::Supertype => write!(f, " :> "),
}
}
}

/// The crate outlives map is computed during typeck and contains the
/// outlives of every item in the local crate. You should not use it
/// directly, because to do so will make your pass dependent on the
3 changes: 1 addition & 2 deletions compiler/rustc_middle/src/ty/print/pretty.rs
Original file line number Diff line number Diff line change
@@ -2847,8 +2847,7 @@ define_print_and_forward_display! {
p!("the type `", print(ty), "` is found in the environment")
}
ty::PredicateKind::Ambiguous => p!("ambiguous"),
// TODO
ty::PredicateKind::AliasRelate(t1, t2, _) => p!(print(t1), " == ", print(t2)),
ty::PredicateKind::AliasRelate(t1, t2, dir) => p!(print(t1), write(" {} ", dir), print(t2)),
}
}

5 changes: 3 additions & 2 deletions compiler/rustc_middle/src/ty/structural_impls.rs
Original file line number Diff line number Diff line change
@@ -177,8 +177,9 @@ impl<'tcx> fmt::Debug for ty::PredicateKind<'tcx> {
write!(f, "TypeWellFormedFromEnv({:?})", ty)
}
ty::PredicateKind::Ambiguous => write!(f, "Ambiguous"),
// TODO
ty::PredicateKind::AliasRelate(t1, t2, _) => write!(f, "AliasRelate({t1:?}, {t2:?})"),
ty::PredicateKind::AliasRelate(t1, t2, dir) => {
write!(f, "AliasRelate({t1:?}, {dir:?}, {t2:?})")
}
}
}
}