Skip to content

Rollup of 8 pull requests #101182

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.

Sign up for GitHub

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

Closed
matthiaskrgr wants to merge 23 commits into from
Closed

Rollup of 8 pull requests #101182

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
636cabc
add incomplete feature async_fn_in_trait
ComputerDruid Aug 18, 2022
448c6a4
Suggest returning closure as impl Fn
compiler-errors Aug 26, 2022
cfd47af
Erase late bound regions before comparing types in suggest_dereferences
compiler-errors Aug 26, 2022
48b3d8a
Drive-by: same_type_modulo_infer should handle ReVar == ReVar
compiler-errors Aug 26, 2022
e63a625
interpret: rename relocation → provenance
RalfJung Aug 27, 2022
2e17247
interpret: make read-pointer-as-bytes *always* work in Miri
RalfJung Aug 27, 2022
cf2c65b
adjust tests
RalfJung Aug 27, 2022
93b7d8d
Add test for APIT
compiler-errors Aug 28, 2022
76dd5c5
Remove `register_attr` feature
JohnTitor Aug 28, 2022
382fa62
Remove `register_attr`-related tests
JohnTitor Aug 28, 2022
1a1220c
validation should only catch UB errors
RalfJung Aug 28, 2022
c46e803
improve OFFSET_IS_ADDR docs
RalfJung Aug 28, 2022
8873e33
Don't --bless in pre-push hook
tmandry Aug 29, 2022
f72697b
rustdoc: remove unused CSS selectors for `.table-display`
notriddle Aug 30, 2022
eaa0025
Add another MaybeUninit array test with const
SUPERCILEX Aug 30, 2022
9966b6f
Rollup merge of #100734 - ComputerDruid:afit_feature, r=tmandry
matthiaskrgr Aug 30, 2022
cd15175
Rollup merge of #101019 - compiler-errors:return-closure-suggestion, …
matthiaskrgr Aug 30, 2022
8aae010
Rollup merge of #101022 - compiler-errors:issue-101020, r=jackh726
matthiaskrgr Aug 30, 2022
7a67d99
Rollup merge of #101101 - RalfJung:read-pointer-as-bytes, r=oli-obk
matthiaskrgr Aug 30, 2022
d9ca6d9
Rollup merge of #101123 - JohnTitor:rm-register-attr, r=TaKO8Ki
matthiaskrgr Aug 30, 2022
8197f6d
Rollup merge of #101175 - tmandry:curse-push-hook, r=jyn514
matthiaskrgr Aug 30, 2022
6597fc2
Rollup merge of #101176 - notriddle:notriddle/rustdoc-table-display, …
matthiaskrgr Aug 30, 2022
f9d17ea
Rollup merge of #101180 - SUPERCILEX:const-maybeuninit, r=TaKO8Ki
matthiaskrgr Aug 30, 2022
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
Drive-by: same_type_modulo_infer should handle ReVar == ReVar
  • Loading branch information
@compiler-errors
compiler-errors committed Aug 26, 2022
commit 48b3d8aa829a5ac3ff317e18ff025ac75a7c9665
5 changes: 4 additions & 1 deletion compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2720,7 +2720,10 @@ impl<'tcx> TypeRelation<'tcx> for SameTypeModuloInfer<'_, 'tcx> {
a: ty::Region<'tcx>,
b: ty::Region<'tcx>,
) -> RelateResult<'tcx, ty::Region<'tcx>> {
if (a.is_var() && b.is_free_or_static()) || (b.is_var() && a.is_free_or_static()) || a == b
if (a.is_var() && b.is_free_or_static())
|| (b.is_var() && a.is_free_or_static())
|| (a.is_var() && b.is_var())
|| a == b
{
Ok(a)
} else {
Expand Down