Skip to content

Commit b285f1e

Browse files
committedAug 11, 2013
auto merge of #8455 : nikomatsakis/rust/issue-5762-objects-dralston-d, r=graydon
Fix #5762 and various other aspects of object invocation. r? @graydon
2 parents 63c62be + 7343478 commit b285f1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1155
-560
lines changed
 

‎src/librustc/back/abi.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ pub static tydesc_field_take_glue: uint = 2u;
4646
pub static tydesc_field_drop_glue: uint = 3u;
4747
pub static tydesc_field_free_glue: uint = 4u;
4848
pub static tydesc_field_visit_glue: uint = 5u;
49-
pub static n_tydesc_fields: uint = 6u;
49+
pub static tydesc_field_borrow_offset: uint = 6u;
50+
pub static n_tydesc_fields: uint = 7u;
5051

5152
// The two halves of a closure: code and environment.
5253
pub static fn_field_code: uint = 0u;

‎src/librustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ pub fn build_session(sopts: @session::options,
785785
pub fn build_session_(sopts: @session::options,
786786
cm: @codemap::CodeMap,
787787
demitter: diagnostic::Emitter,
788-
span_diagnostic_handler: @diagnostic::span_handler)
788+
span_diagnostic_handler: @mut diagnostic::span_handler)
789789
-> Session {
790790
let target_cfg = build_target_config(sopts, demitter);
791791
let p_s = parse::new_parse_sess_special_handler(span_diagnostic_handler,

0 commit comments

Comments
 (0)