bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge pull request #248 from sinhpham/unicode_string_lit

Browse source 
Unicode string lit
This commit is contained in:
Nick Cameron 2015-09-07 08:01:06 +12:00
commit 8750399ef4
8 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/expr.rs
View file

@ -28,8 +28,8 @@ impl Rewrite for ast::Expr {
match self.node {
ast::Expr_::ExprLit(ref l) => {
match l.node {
ast::Lit_::LitStr(ref is, ast::StrStyle::CookedStr) => {
rewrite_string_lit(context, &is, l.span, width, offset)
ast::Lit_::LitStr(_, ast::StrStyle::CookedStr) => {
rewrite_string_lit(context, l.span, width, offset)
}
_ => Some(context.snippet(self.span)),
}
@ -823,7 +823,6 @@ fn rewrite_pat_expr(context: &RewriteContext,
}
fn rewrite_string_lit(context: &RewriteContext,
s: &str,
span: Span,
width: usize,
offset: usize)
@ -842,7 +841,10 @@ fn rewrite_string_lit(context: &RewriteContext,
trim_end: false,
};
Some(rewrite_string(&s.escape_default(), &fmt))
let string_lit = context.snippet(span);
let str_lit = &string_lit[1..string_lit.len() - 1]; // Remove the quote characters.
Some(rewrite_string(str_lit, &fmt))
}
fn rewrite_call(context: &RewriteContext,