Skip to content
This repository was archived by the owner on Jul 6, 2019. It is now read-only.

Fixed nightly fallout and dependency tracking for tests #133

Merged
merged 2 commits into from
Aug 13, 2014
Merged

Fixed nightly fallout and dependency tracking for tests #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75bc322
zinc tests depend on ioreg
farcaller Aug 12, 2014
c4dae14
Using new lifetime_def (fixes #132)
farcaller Aug 12, 2014
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
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ rust_tests :platformtree_test, {

rust_tests :zinc_test, {
source: 'main.rs'.in_source,
deps: [:core_crate],
deps: [:core_crate, :macro_ioreg],
produce: 'zinc_test'.in_build,
recompile_on: [:platform],
build_for: :host,
Expand Down
3 changes: 1 addition & 2 deletions platformtree/builder/os.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ fn build_args(builder: &mut Builder, cx: &mut ExtCtxt,
}

let name_ident = cx.ident_of(format!("{}_args", struct_name).as_slice());
let a_lifetime = cx.lifetime(DUMMY_SP, intern("'a"));
let mut collected_params = vec!();
let mut ty_params_vec = vec!();
for ty in ty_params.iter() {
Expand All @@ -173,7 +172,7 @@ fn build_args(builder: &mut Builder, cx: &mut ExtCtxt,
super_struct: None,
is_virtual: false,
}, ast::Generics {
lifetimes: vec!(a_lifetime),
lifetimes: vec!(cx.lifetime_def(DUMMY_SP, intern("'a"), vec!())),
ty_params: OwnedSlice::from_vec(collected_params),
}),
vis: ast::Public,
Expand Down