vfmt: cleanup StringInterLiteral.get_fspec_braces/1
parent
f0dd2bbf6e
commit
b8e9f085eb
|
@ -190,7 +190,7 @@ fn (mut context Context) kill_pgroup() {
|
|||
}
|
||||
|
||||
fn (mut context Context) compilation_runner_loop() {
|
||||
cmd := '"${context.vexe}" ${context.opts.join(' ')}'
|
||||
cmd := '"$context.vexe" ${context.opts.join(' ')}'
|
||||
_ := <-context.rerun_channel
|
||||
for {
|
||||
context.elog('>> loop: v_cycles: $context.v_cycles')
|
||||
|
|
|
@ -200,7 +200,7 @@ pub fn (b &Benchmark) total_message(msg string) string {
|
|||
if b.nskip > 0 {
|
||||
tmsg += term.colorize(term.bold, term.colorize(term.yellow, '$b.nskip skipped')) + ', '
|
||||
}
|
||||
tmsg += '${b.ntotal} total. ${term.colorize(term.bold, 'Runtime:')} ${b.bench_timer.elapsed().microseconds() / 1000} ms.\n'
|
||||
tmsg += '$b.ntotal total. ${term.colorize(term.bold, 'Runtime:')} ${b.bench_timer.elapsed().microseconds() / 1000} ms.\n'
|
||||
return tmsg
|
||||
}
|
||||
|
||||
|
|
|
@ -140,12 +140,9 @@ pub fn (lit &StringInterLiteral) get_fspec_braces(i int) (string, bool) {
|
|||
|| (lit.fills[i] && lit.fwidths[i] >= 0) || lit.fwidths[i] != 0
|
||||
|| lit.precisions[i] != 987698
|
||||
mut needs_braces := needs_fspec
|
||||
for x in lit.exprs {
|
||||
sx := x.str()
|
||||
sx := lit.exprs[i].str()
|
||||
if sx.contains(r'"') || sx.contains(r"'") {
|
||||
needs_braces = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !needs_braces {
|
||||
if i + 1 < lit.vals.len && lit.vals[i + 1].len > 0 {
|
||||
|
@ -484,7 +481,7 @@ pub fn (node Stmt) str() string {
|
|||
}
|
||||
|
||||
fn field_to_string(f ConstField) string {
|
||||
return '${f.name.trim_prefix(f.mod + '.')} = ${f.expr}'
|
||||
return '${f.name.trim_prefix(f.mod + '.')} = $f.expr'
|
||||
}
|
||||
|
||||
pub fn (e CompForKind) str() string {
|
||||
|
|
|
@ -901,7 +901,7 @@ fn (mut g Gen) table_gen(node ast.SqlStmt, typ SqlType) string {
|
|||
for f in v {
|
||||
tmp << '`$f`'
|
||||
}
|
||||
fields << '/* ${k} */UNIQUE(${tmp.join(', ')})'
|
||||
fields << '/* $k */UNIQUE(${tmp.join(', ')})'
|
||||
}
|
||||
}
|
||||
if typ == .mysql {
|
||||
|
|
Loading…
Reference in New Issue