mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #100018 - nnethercote:clean-up-LitKind, r=petrochenkov

Browse Source 
Clean up `LitKind`

r? ``@petrochenkov``
This commit is contained in:
Matthias Krüger 2022-08-17 12:32:49 +02:00 committed by GitHub
commit 870ed721af
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/expr.rs
View File

@ -79,7 +79,7 @@ pub(crate) fn format_expr(
if let Some(expr_rw) = rewrite_literal(context, l, shape) { if let Some(expr_rw) = rewrite_literal(context, l, shape) {
Some(expr_rw) Some(expr_rw)
} else { } else {
if let LitKind::StrRaw(_) = l.token.kind { if let LitKind::StrRaw(_) = l.token_lit.kind {
Some(context.snippet(l.span).trim().into()) Some(context.snippet(l.span).trim().into())
} else { } else {
None None
@ -1226,7 +1226,7 @@ fn rewrite_string_lit(context: &RewriteContext<'_>, span: Span, shape: Shape) ->
fn rewrite_int_lit(context: &RewriteContext<'_>, lit: &ast::Lit, shape: Shape) -> Option<String> { fn rewrite_int_lit(context: &RewriteContext<'_>, lit: &ast::Lit, shape: Shape) -> Option<String> {
let span = lit.span; let span = lit.span;
let symbol = lit.token.symbol.as_str(); let symbol = lit.token_lit.symbol.as_str();
if let Some(symbol_stripped) = symbol.strip_prefix("0x") { if let Some(symbol_stripped) = symbol.strip_prefix("0x") {
let hex_lit = match context.config.hex_literal_case() { let hex_lit = match context.config.hex_literal_case() {
@ -1239,7 +1239,9 @@ fn rewrite_int_lit(context: &RewriteContext<'_>, lit: &ast::Lit, shape: Shape) -
format!( format!(
"0x{}{}", "0x{}{}",
hex_lit, hex_lit,
lit.token.suffix.map_or(String::new(), |s| s.to_string()) lit.token_lit
.suffix
.map_or(String::new(), |s| s.to_string())
), ),
context.config.max_width(), context.config.max_width(),
shape, shape,