Browse Source

Combine adjacent `sbprint*`/`to_string` calls

The `sbprint*` procs already return a string conversion.
Feoramund 1 year ago
parent
commit
700f9c94bd
1 changed files with 6 additions and 12 deletions
  1. 6 12
      core/fmt/fmt.odin

+ 6 - 12
core/fmt/fmt.odin

@@ -124,8 +124,7 @@ register_user_formatter :: proc(id: typeid, formatter: User_Formatter) -> Regist
 aprint :: proc(args: ..any, sep := " ", allocator := context.allocator) -> string {
 aprint :: proc(args: ..any, sep := " ", allocator := context.allocator) -> string {
 	str: strings.Builder
 	str: strings.Builder
 	strings.builder_init(&str, allocator)
 	strings.builder_init(&str, allocator)
-	sbprint(&str, ..args, sep=sep)
-	return strings.to_string(str)
+	return sbprint(&str, ..args, sep=sep)
 }
 }
 // 	Creates a formatted string with a newline character at the end
 // 	Creates a formatted string with a newline character at the end
 //
 //
@@ -141,8 +140,7 @@ aprint :: proc(args: ..any, sep := " ", allocator := context.allocator) -> strin
 aprintln :: proc(args: ..any, sep := " ", allocator := context.allocator) -> string {
 aprintln :: proc(args: ..any, sep := " ", allocator := context.allocator) -> string {
 	str: strings.Builder
 	str: strings.Builder
 	strings.builder_init(&str, allocator)
 	strings.builder_init(&str, allocator)
-	sbprintln(&str, ..args, sep=sep)
-	return strings.to_string(str)
+	return sbprintln(&str, ..args, sep=sep)
 }
 }
 // 	Creates a formatted string using a format string and arguments
 // 	Creates a formatted string using a format string and arguments
 //
 //
@@ -159,8 +157,7 @@ aprintln :: proc(args: ..any, sep := " ", allocator := context.allocator) -> str
 aprintf :: proc(fmt: string, args: ..any, allocator := context.allocator, newline := false) -> string {
 aprintf :: proc(fmt: string, args: ..any, allocator := context.allocator, newline := false) -> string {
 	str: strings.Builder
 	str: strings.Builder
 	strings.builder_init(&str, allocator)
 	strings.builder_init(&str, allocator)
-	sbprintf(&str, fmt, ..args, newline=newline)
-	return strings.to_string(str)
+	return sbprintf(&str, fmt, ..args, newline=newline)
 }
 }
 // 	Creates a formatted string using a format string and arguments, followed by a newline.
 // 	Creates a formatted string using a format string and arguments, followed by a newline.
 //
 //
@@ -190,8 +187,7 @@ aprintfln :: proc(fmt: string, args: ..any, allocator := context.allocator) -> s
 tprint :: proc(args: ..any, sep := " ") -> string {
 tprint :: proc(args: ..any, sep := " ") -> string {
 	str: strings.Builder
 	str: strings.Builder
 	strings.builder_init(&str, context.temp_allocator)
 	strings.builder_init(&str, context.temp_allocator)
-	sbprint(&str, ..args, sep=sep)
-	return strings.to_string(str)
+	return sbprint(&str, ..args, sep=sep)
 }
 }
 // 	Creates a formatted string with a newline character at the end
 // 	Creates a formatted string with a newline character at the end
 //
 //
@@ -207,8 +203,7 @@ tprint :: proc(args: ..any, sep := " ") -> string {
 tprintln :: proc(args: ..any, sep := " ") -> string {
 tprintln :: proc(args: ..any, sep := " ") -> string {
 	str: strings.Builder
 	str: strings.Builder
 	strings.builder_init(&str, context.temp_allocator)
 	strings.builder_init(&str, context.temp_allocator)
-	sbprintln(&str, ..args, sep=sep)
-	return strings.to_string(str)
+	return sbprintln(&str, ..args, sep=sep)
 }
 }
 // 	Creates a formatted string using a format string and arguments
 // 	Creates a formatted string using a format string and arguments
 //
 //
@@ -225,8 +220,7 @@ tprintln :: proc(args: ..any, sep := " ") -> string {
 tprintf :: proc(fmt: string, args: ..any, newline := false) -> string {
 tprintf :: proc(fmt: string, args: ..any, newline := false) -> string {
 	str: strings.Builder
 	str: strings.Builder
 	strings.builder_init(&str, context.temp_allocator)
 	strings.builder_init(&str, context.temp_allocator)
-	sbprintf(&str, fmt, ..args, newline=newline)
-	return strings.to_string(str)
+	return sbprintf(&str, fmt, ..args, newline=newline)
 }
 }
 // 	Creates a formatted string using a format string and arguments, followed by a newline.
 // 	Creates a formatted string using a format string and arguments, followed by a newline.
 //
 //