Skip to content

codegen: Improve the assertion message of failing layout tests. #487

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

Merged
merged 2 commits into from
Feb 8, 2017
Merged

codegen: Improve the assertion message of failing layout tests. #487

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c69851
codegen: Fix the build in older rustc versions.
emilio Feb 7, 2017
193a103
codegen: Improve the assertion message of the failing layout tests.
emilio Feb 7, 2017
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
6 changes: 3 additions & 3 deletions src/codegen/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2458,12 +2458,12 @@ mod utils {
use aster;
use ir::context::{BindgenContext, ItemId};
use ir::item::{Item, ItemCanonicalPath};
use ir::function::FunctionSig;
use ir::ty::TypeKind;
use std::mem;
use syntax::ast;
use syntax::ptr::P;


pub fn prepend_objc_header(ctx: &BindgenContext,
result: &mut Vec<P<ast::Item>>) {
let use_objc = if ctx.options().objc_extern_crate {
Expand Down Expand Up @@ -2745,7 +2745,7 @@ mod utils {
}

pub fn fnsig_return_ty(ctx: &BindgenContext,
sig: &super::FunctionSig)
sig: &FunctionSig)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are going to support older rustc, we should add the oldest supported version to our travis ci matrix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only temporary until Gecko updates is rustc version anyway, should be <1week

-> ast::FunctionRetTy {
let return_item = ctx.resolve_item(sig.return_type());
if let TypeKind::Void = *return_item.kind().expect_type().kind() {
Expand All @@ -2756,7 +2756,7 @@ mod utils {
}

pub fn fnsig_arguments(ctx: &BindgenContext,
sig: &super::FunctionSig)
sig: &FunctionSig)
-> Vec<ast::Arg> {
use super::ToPtr;
let mut unnamed_arguments = 0;
Expand Down