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.

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

Move pointee_info_at from rustc_codegen_llvm to rustc_target. #60237

Merged
merged 16 commits into from
May 5, 2019
+233 −154
Merged

Move pointee_info_at from rustc_codegen_llvm to rustc_target. #60237

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b7266c6
Move pointee_info_at to TyLayoutMethods.
wildarch Dec 24, 2018
e395026
Fix typo in src/librustc/ty/layout.rs
oli-obk Dec 28, 2018
ed716d4
Return instead of collecting to mut result.
wildarch Dec 28, 2018
f1f9343
Remove old pointee_info_at body.
wildarch Dec 28, 2018
d47ec57
Add param_env parameter to pointee_info_at.
wildarch Dec 28, 2018
7257fc3
Make line fit within 100 character limit.
wildarch Jan 11, 2019
82410e8
impl `pointee_info_at` in TyLayout.
wildarch Mar 11, 2019
199ff02
resolving conflicts
saleemjaffer Apr 24, 2019
35bd58b
tidy fixes
saleemjaffer Apr 24, 2019
8e3d9f1
add to_result to ty::MaybeResult
saleemjaffer Apr 25, 2019
852dd49
removing map_same from MaybeResult
saleemjaffer Apr 30, 2019
8802dc0
adding is_freeze to TyLayoutMethods
saleemjaffer May 3, 2019
18679cd
adding HasParamEnv trait
saleemjaffer May 4, 2019
94a4892
resolving conflicts
saleemjaffer May 4, 2019
80d5478
removing param_env from pointee_info_at
saleemjaffer May 4, 2019
968eb7f
code review fixes
saleemjaffer May 5, 2019
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
resolving conflicts
@saleemjaffer
saleemjaffer committed May 4, 2019
commit 94a48924da05d2c3c147ce7739d497fdcf33ca01
7 changes: 3 additions & 4 deletions src/librustc/ty/layout.rs
View file
Original file line number Diff line number Diff line change
@@ -1720,10 +1720,9 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
let tcx = cx.tcx();
let discr_layout = |discr: &Scalar| -> C::TyLayout {
let layout = LayoutDetails::scalar(cx, discr.clone());
MaybeResult::from_ok(TyLayout {
details: tcx.intern_layout(layout),
ty: discr.value.to_ty(tcx)
})
MaybeResult::from(Ok(
TyLayout {details: tcx.intern_layout(layout),ty: discr.value.to_ty(tcx)}
))
};

cx.layout_of(match this.ty.sty {