Skip to content

Commit d34dc14

Browse files
committed
refactor(core+std): rename .write_string() method -> .write()
1 parent d4ce72a commit d34dc14

File tree

22 files changed

+170
-170
lines changed

22 files changed

+170
-170
lines changed

cmd/src/tools/cmd_new.ri

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,16 @@ func generate_rivet_json(project: build.Project) -> string {
178178
}
179179
if !project.authors.is_empty() {
180180
sb.writeln(",");
181-
sb.write_string(" \"authors\": [");
181+
sb.write(" \"authors\": [");
182182
for i, author in project.authors {
183-
sb.write_string("\"");
184-
sb.write_string(author);
185-
sb.write_string("\"");
183+
sb.write("\"");
184+
sb.write(author);
185+
sb.write("\"");
186186
if i < project.authors.len - 1 {
187-
sb.write_string(", ");
187+
sb.write(", ");
188188
}
189189
}
190-
sb.write_string("]");
190+
sb.write("]");
191191
}
192192
if !project.repository_url.is_empty() {
193193
sb.writeln(",");

lib/core/src/StringBuilder.c.ri

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub struct StringBuilder < Stringable {
5050
}
5151

5252
#[inline]
53-
pub func write_string(mut self, s: string) {
53+
pub func write(mut self, s: string) {
5454
unsafe {
5555
self.write_raw_with_len(s.ptr, s.len);
5656
}
@@ -67,24 +67,24 @@ pub struct StringBuilder < Stringable {
6767

6868
pub func write_join(mut self, ss: [:]string, sep: string := "") {
6969
if ss.len == 1 {
70-
self.write_string(ss[0]);
70+
self.write(ss[0]);
7171
} else {
7272
for i, s in ss {
73-
self.write_string(s);
73+
self.write(s);
7474
if i < ss.len - 1 {
75-
self.write_string(sep);
75+
self.write(sep);
7676
}
7777
}
7878
}
7979
}
8080

8181
#[inline]
8282
pub func write_fmt(mut self, s: string, args: ...Stringable) {
83-
self.write_string(s.fmt(args));
83+
self.write(s.fmt(args));
8484
}
8585

8686
pub func writeln_fmt(mut self, s: string, args: ...Stringable) {
87-
self.write_string(s.fmt(args));
87+
self.write(s.fmt(args));
8888
self.write_byte('\n');
8989
}
9090

lib/core/src/StringFormatter.ri

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ pub struct StringFormatter {
3535
if has_fwidth && fwidth > 0 {
3636
value_len := @as(int, value.len);
3737
if value_len <= fwidth {
38-
self.res.write_string(" ".repeat(@as(uint, fwidth - value_len)));
38+
self.res.write(" ".repeat(@as(uint, fwidth - value_len)));
3939
}
4040
}
41-
self.res.write_string(value);
41+
self.res.write(value);
4242
if has_fwidth && fwidth < 0 {
4343
fwidth = -fwidth;
4444
value_len := @as(int, value.len);
4545
if value_len <= fwidth {
46-
self.res.write_string(" ".repeat(@as(uint, fwidth - value_len)));
46+
self.res.write(" ".repeat(@as(uint, fwidth - value_len)));
4747
}
4848
}
4949
if !has_fwidth {
@@ -77,15 +77,15 @@ pub struct StringFormatter {
7777
if has_fwidth && fwidth > 0 {
7878
value_len := @as(int, value.len);
7979
if value_len <= fwidth {
80-
self.res.write_string(" ".repeat(@as(uint, fwidth - value_len)));
80+
self.res.write(" ".repeat(@as(uint, fwidth - value_len)));
8181
}
8282
}
83-
self.res.write_string(value);
83+
self.res.write(value);
8484
if has_fwidth && fwidth < 0 {
8585
fwidth = -fwidth;
8686
value_len := @as(int, value.len);
8787
if value_len <= fwidth {
88-
self.res.write_string(" ".repeat(@as(uint, fwidth - value_len)));
88+
self.res.write(" ".repeat(@as(uint, fwidth - value_len)));
8989
}
9090
}
9191
} else {

lib/core/src/demangle.ri

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func demangle_symbol(name: string) -> string {
1919
}
2020

2121
if !res.is_empty() {
22-
res.write_string(".");
22+
res.write(".");
2323
}
2424

2525
buf_len := @as(uint, buf.as_uint64());
@@ -33,10 +33,10 @@ func demangle_symbol(name: string) -> string {
3333

3434
byte = unsafe { name.ptr[idx] };
3535
if byte == 'F' {
36-
res.write_string("()");
36+
res.write("()");
3737
break;
3838
} else if byte == 'M' {
39-
res.write_string("(self)");
39+
res.write("(self)");
4040
break;
4141
} else if !byte.is_digit() {
4242
break; // end

lib/core/src/string.c.ri

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub struct string < Stringable, Hashable, Throwable {
9393
}
9494
mut sb := StringBuilder.from_string(self);
9595
for other in others {
96-
sb.write_string(other);
96+
sb.write(other);
9797
}
9898
return sb.to_string();
9999
}
@@ -142,12 +142,12 @@ pub struct string < Stringable, Hashable, Throwable {
142142
while i < words.len : i += 1 {
143143
word := words[i];
144144
if word.len + 1 > space_left {
145-
wrapped.write_string(end);
146-
wrapped.write_string(word);
145+
wrapped.write(end);
146+
wrapped.write(word);
147147
space_left = width - word.len;
148148
} else {
149-
wrapped.write_string(" ");
150-
wrapped.write_string(word);
149+
wrapped.write(" ");
150+
wrapped.write(word);
151151
space_left -= 1 + word.len;
152152
}
153153
}

lib/core/src/string_patterns.ri

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ extend string {
318318
mut sb := StringBuilder.new(new_len_hint);
319319
mut i: uint := 0;
320320
while {
321-
sb.write_string(self.substr(i, occurrence_idx));
322-
sb.write_string(new_value);
321+
sb.write(self.substr(i, occurrence_idx));
322+
sb.write(new_value);
323323
i = occurrence_idx + old_value.len;
324324
if occurrence_idx >= self.len {
325325
break;
@@ -330,7 +330,7 @@ extend string {
330330
break;
331331
}
332332
}
333-
sb.write_string(self.substr(i, self.len));
333+
sb.write(self.substr(i, self.len));
334334
return sb.to_string();
335335
}
336336
return self;

lib/rivet/src/ast/CHeader.ri

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,22 @@ struct CDefine < traits.Stringable {
5959

6060
pub func to_string(&self) -> string {
6161
mut sb := strings.Builder.new();
62-
sb.write_string(if self.is_macro { "macro " } else { "const " });
63-
sb.write_string(self.name);
62+
sb.write(if self.is_macro { "macro " } else { "const " });
63+
sb.write(self.name);
6464
if self.is_macro && self.args.len > 0 {
65-
sb.write_string("(");
65+
sb.write("(");
6666
for i, arg in self.args {
67-
sb.write_string(arg);
67+
sb.write(arg);
6868
if i < self.args.len - 1 {
69-
sb.write_string(", ");
69+
sb.write(", ");
7070
}
7171
}
72-
sb.write_string(") =>");
72+
sb.write(") =>");
7373
} else {
74-
sb.write_string(" =");
74+
sb.write(" =");
7575
}
76-
sb.write_string(" ");
77-
sb.write_string(self.value);
76+
sb.write(" ");
77+
sb.write(self.value);
7878
return sb.to_string();
7979
}
8080
}

0 commit comments

Comments
 (0)