@@ -21,7 +21,7 @@ static BUG_REPORT_URL: &'static str =
21
21
22
22
pub trait Emitter {
23
23
fn emit ( & self ,
24
- cmsp : Option < ( @ codemap:: CodeMap , Span ) > ,
24
+ cmsp : Option < ( & codemap:: CodeMap , Span ) > ,
25
25
msg : & str ,
26
26
lvl : level ) ;
27
27
}
@@ -36,18 +36,18 @@ pub struct SpanHandler {
36
36
37
37
impl SpanHandler {
38
38
pub fn span_fatal ( @mut self , sp : Span , msg : & str ) -> ! {
39
- self . handler . emit ( Some ( ( self . cm , sp) ) , msg, fatal) ;
39
+ self . handler . emit ( Some ( ( & * self . cm , sp) ) , msg, fatal) ;
40
40
fail ! ( ) ;
41
41
}
42
42
pub fn span_err ( @mut self , sp : Span , msg : & str ) {
43
- self . handler . emit ( Some ( ( self . cm , sp) ) , msg, error) ;
43
+ self . handler . emit ( Some ( ( & * self . cm , sp) ) , msg, error) ;
44
44
self . handler . bump_err_count ( ) ;
45
45
}
46
46
pub fn span_warn ( @mut self , sp : Span , msg : & str ) {
47
- self . handler . emit ( Some ( ( self . cm , sp) ) , msg, warning) ;
47
+ self . handler . emit ( Some ( ( & * self . cm , sp) ) , msg, warning) ;
48
48
}
49
49
pub fn span_note ( @mut self , sp : Span , msg : & str ) {
50
- self . handler . emit ( Some ( ( self . cm , sp) ) , msg, note) ;
50
+ self . handler . emit ( Some ( ( & * self . cm , sp) ) , msg, note) ;
51
51
}
52
52
pub fn span_bug ( @mut self , sp : Span , msg : & str ) -> ! {
53
53
self . span_fatal ( sp, ice_msg ( msg) ) ;
@@ -111,7 +111,7 @@ impl Handler {
111
111
self . bug ( ~"unimplemented " + msg);
112
112
}
113
113
pub fn emit(@mut self,
114
- cmsp: Option<(@ codemap::CodeMap, Span)>,
114
+ cmsp: Option<(& codemap::CodeMap, Span)>,
115
115
msg: &str,
116
116
lvl: level) {
117
117
self.emit.emit(cmsp, msg, lvl);
@@ -227,7 +227,7 @@ pub struct DefaultEmitter;
227
227
228
228
impl Emitter for DefaultEmitter {
229
229
fn emit ( & self ,
230
- cmsp : Option < ( @ codemap:: CodeMap , Span ) > ,
230
+ cmsp : Option < ( & codemap:: CodeMap , Span ) > ,
231
231
msg : & str ,
232
232
lvl : level ) {
233
233
match cmsp {
@@ -244,20 +244,20 @@ impl Emitter for DefaultEmitter {
244
244
}
245
245
}
246
246
247
- fn highlight_lines ( cm : @ codemap:: CodeMap ,
247
+ fn highlight_lines ( cm : & codemap:: CodeMap ,
248
248
sp : Span ,
249
249
lvl : level ,
250
- lines : @ codemap:: FileLines ) {
250
+ lines : & codemap:: FileLines ) {
251
251
let fm = lines. file ;
252
252
let mut err = io:: stderr ( ) ;
253
253
let err = & mut err as & mut io:: Writer ;
254
254
255
255
// arbitrarily only print up to six lines of the error
256
256
let max_lines = 6 u;
257
257
let mut elided = false ;
258
- let mut display_lines = /* FIXME (#2543) */ lines. lines . clone ( ) ;
258
+ let mut display_lines = lines. lines . as_slice ( ) ;
259
259
if display_lines. len ( ) > max_lines {
260
- display_lines = display_lines. slice ( 0 u, max_lines) . to_owned ( ) ;
260
+ display_lines = display_lines. slice ( 0 u, max_lines) ;
261
261
elided = true ;
262
262
}
263
263
// Print the offending lines
@@ -311,7 +311,7 @@ fn highlight_lines(cm: @codemap::CodeMap,
311
311
}
312
312
}
313
313
314
- fn print_macro_backtrace ( cm : @ codemap:: CodeMap , sp : Span ) {
314
+ fn print_macro_backtrace ( cm : & codemap:: CodeMap , sp : Span ) {
315
315
for ei in sp. expn_info . iter ( ) {
316
316
let ss = ei. callee . span . as_ref ( ) . map_default ( ~"", |span| cm. span_to_str ( * span) ) ;
317
317
let ( pre, post) = match ei. callee . format {
0 commit comments