nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-25 05:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

librustc: De-@str liveness

Browse Source
This commit is contained in:
Patrick Walton 2014-01-31 12:33:42 -08:00 committed by Huon Wilson
parent b265dd4156
commit e9ce855beb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc/middle/liveness.rs
View File

@ -120,6 +120,7 @@ use std::vec;
use syntax::ast::*;
use syntax::codemap::Span;
use syntax::parse::token::special_idents;
use syntax::parse::token;
use syntax::print::pprust::{expr_to_str, block_to_str};
use syntax::{visit, ast_util};
use syntax::visit::{Visitor, FnKind};
@ -332,13 +333,14 @@ impl IrMaps {
}
}
pub fn variable_name(&self, var: Variable) -> @str {
pub fn variable_name(&self, var: Variable) -> ~str {
let var_kinds = self.var_kinds.borrow();
match var_kinds.get()[var.get()] {
Local(LocalInfo { ident: nm, .. }) | Arg(_, nm) => {
self.tcx.sess.str_of(nm)
let string = token::get_ident(nm.name);
string.get().to_str()
},
ImplicitRet => @"<implicit-ret>"
ImplicitRet => ~"<implicit-ret>"
}
}
@ -1669,7 +1671,7 @@ impl Liveness {
}
}
pub fn should_warn(&self, var: Variable) -> Option<@str> {
pub fn should_warn(&self, var: Variable) -> Option<~str> {
let name = self.ir.variable_name(var);
if name.len() == 0 || name[0] == ('_' as u8) { None } else { Some(name) }
}