Skip to content

Commit 5c2c70b

Browse files
committed
refact(rivetc+rivet): remove public, use pub instead
1 parent 9d00135 commit 5c2c70b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+1429
-1427
lines changed

cmd/src/tools/cmd_new.ri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var availableTemplates := "Available templates:
2929
bin A simple binary project (default).
3030
lib A simple library project.";
3131

32-
public func new(args: []string, is_init: bool) -> ! {
32+
pub func new(args: []string, is_init: bool) -> ! {
3333
mut template := "";
3434
mut fp := flag.FlagParser.new(args);
3535
if is_init {

cmd/src/tools/templates/mod.ri

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// Use of this source code is governed by an MIT license that can
33
// be found in the LICENSE file.
44

5-
public var mainFile := "import std/console;
5+
pub var mainFile := "import std/console;
66

77
func main() {
88
console.writeln(\"Hello World!\");
99
}
1010
";
1111

12-
public var libFile := "public func add(a: int32, b: int32) -> int32 {
12+
pub var libFile := "pub func add(a: int32, b: int32) -> int32 {
1313
return a + b;
1414
}
1515

@@ -18,7 +18,7 @@ test \"test `add` function\" {
1818
}
1919
";
2020

21-
public var gitignoreFile := "# Binaries for programs and plugins
21+
pub var gitignoreFile := "# Binaries for programs and plugins
2222
{}
2323
*.exe
2424
*.exe~
@@ -39,12 +39,12 @@ bin/
3939
.env
4040
";
4141

42-
public var gitattributesFile := "* text=auto eol=lf
42+
pub var gitattributesFile := "* text=auto eol=lf
4343
*.bat eol=crlf
4444
*.ri linguist-language=Rivet text=auto eol=lf
4545
";
4646

47-
public var editorConfigFile := "[*]
47+
pub var editorConfigFile := "[*]
4848
charset = utf-8
4949
end_of_line = lf
5050
insert_final_newline = true

cmd/src/tools/utils.ri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import std/console;
66
import std/console/styles;
77

88
#[inline]
9-
public func readln(prompt: string) -> ?string {
9+
pub func readln(prompt: string) -> ?string {
1010
prefix := styles.bold(styles.green("> "));
1111
return if prompt.is_empty() {
1212
console.readln(prefix)

lib/c/src/ctypes/mod.ri

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@
22
// Use of this source code is governed by an MIT license that can
33
// be found in the LICENSE file.
44

5-
public alias char := uint8;
6-
public alias schar := int8;
7-
public alias uchar := uint8;
8-
9-
public alias short := int16;
10-
public alias ushort := uint16;
11-
12-
public alias int := int32;
13-
public alias uint := uint32;
14-
15-
public alias long := int64;
16-
public alias longlong := int64;
17-
18-
public alias ulong := uint64;
19-
public alias ulonglong := uint64;
20-
21-
public alias float := float32;
22-
public alias double := float64;
23-
24-
public alias wchar_t := uint32;
25-
public alias intmax_t := int64;
26-
public alias uintmax_t := uint64;
27-
28-
public alias size_t := uint;
29-
public alias ptrdiff_t := int;
30-
public alias intptr_t := int;
31-
public alias uintptr_t := uint;
32-
public alias ssize_t := int;
33-
34-
public alias pid_t := int32;
35-
public alias off_t := int64;
36-
public alias ino_t := uint64;
37-
public alias dev_t := uint64;
38-
public alias uid_t := uint32;
39-
public alias gid_t := uint32;
40-
public alias mode_t := uint;
5+
pub alias char := uint8;
6+
pub alias schar := int8;
7+
pub alias uchar := uint8;
8+
9+
pub alias short := int16;
10+
pub alias ushort := uint16;
11+
12+
pub alias int := int32;
13+
pub alias uint := uint32;
14+
15+
pub alias long := int64;
16+
pub alias longlong := int64;
17+
18+
pub alias ulong := uint64;
19+
pub alias ulonglong := uint64;
20+
21+
pub alias float := float32;
22+
pub alias double := float64;
23+
24+
pub alias wchar_t := uint32;
25+
pub alias intmax_t := int64;
26+
pub alias uintmax_t := uint64;
27+
28+
pub alias size_t := uint;
29+
pub alias ptrdiff_t := int;
30+
pub alias intptr_t := int;
31+
pub alias uintptr_t := uint;
32+
pub alias ssize_t := int;
33+
34+
pub alias pid_t := int32;
35+
pub alias off_t := int64;
36+
pub alias ino_t := uint64;
37+
pub alias dev_t := uint64;
38+
pub alias uid_t := uint32;
39+
pub alias gid_t := uint32;
40+
pub alias mode_t := uint;

lib/c/src/errno.ri

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
import c/libc;
66

77
#[boxed]
8-
public struct ErrnoError < Throwable {
9-
public msg: string;
10-
public code: int32;
8+
pub struct ErrnoError < Throwable {
9+
pub msg: string;
10+
pub code: int32;
1111

12-
public func to_string(self) -> string {
12+
pub func to_string(self) -> string {
1313
return "errno: {} (code: {})".fmt(self.msg, self.code);
1414
}
1515
}
1616

1717
#[inline]
18-
public func errno() -> int32 {
18+
pub func errno() -> int32 {
1919
return unsafe {
2020
#if _LINUX_
2121
libc.__errno_location()?.*
@@ -26,7 +26,7 @@ public func errno() -> int32 {
2626
}
2727

2828
#[inline]
29-
public func errno_msg(code: int32 := errno()) -> string {
29+
pub func errno_msg(code: int32 := errno()) -> string {
3030
unsafe {
3131
return if s := libc.strerror(code) {
3232
string.from_raw(s)
@@ -37,6 +37,6 @@ public func errno_msg(code: int32 := errno()) -> string {
3737
}
3838

3939
#[inline]
40-
public func last_errno_error() -> ErrnoError {
40+
pub func last_errno_error() -> ErrnoError {
4141
return ErrnoError(errno_msg(), errno());
4242
}

lib/c/src/libc/dirent.ri

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
// Use of this source code is governed by an MIT license that can
33
// be found in the LICENSE file.
44

5-
public struct dirent {
6-
public d_ino: uint;
7-
public d_off: uint;
8-
public d_reclen: uint16;
9-
public d_type: uint8;
10-
public d_name: [256]uint8;
5+
pub struct dirent {
6+
pub d_ino: uint;
7+
pub d_off: uint;
8+
pub d_reclen: uint16;
9+
pub d_type: uint8;
10+
pub d_name: [256]uint8;
1111
}
1212

1313
extern (C) {
14-
public func opendir(d: [&]uint8) -> ?&dirent;
15-
public func readdir(d: &dirent) -> ?&dirent;
16-
public func closedir(d: &dirent) -> int32;
14+
pub func opendir(d: [&]uint8) -> ?&dirent;
15+
pub func readdir(d: &dirent) -> ?&dirent;
16+
pub func closedir(d: &dirent) -> int32;
1717
}

lib/c/src/libc/dlfcn.ri

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// Use of this source code is governed by an MIT license that can
33
// be found in the LICENSE file.
44

5-
public const RTLD_LAZY := 0x001;
6-
public const RTLD_NOW := 0x002;
7-
public const RTLD_BINDING_MASK := 0x3;
8-
public const RTLD_GLOBAL := 0x100;
5+
pub const RTLD_LAZY := 0x001;
6+
pub const RTLD_NOW := 0x002;
7+
pub const RTLD_BINDING_MASK := 0x3;
8+
pub const RTLD_GLOBAL := 0x100;
99

1010
extern (C) {
11-
public func dlopen(__file: [&]uint8, __mode: int32) -> ?rawptr;
12-
public func dlclose(__handle: rawptr) -> int32;
13-
public func dlsym(__handle: rawptr, __name: [&]uint8) -> ?rawptr;
14-
public func dlerror() -> ?[&]uint8;
11+
pub func dlopen(__file: [&]uint8, __mode: int32) -> ?rawptr;
12+
pub func dlclose(__handle: rawptr) -> int32;
13+
pub func dlsym(__handle: rawptr, __name: [&]uint8) -> ?rawptr;
14+
pub func dlerror() -> ?[&]uint8;
1515
}

lib/c/src/libc/errno.ri

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
#if _LINUX_
66
extern (C) {
7-
public func __errno_location() -> ?&mut int32;
7+
pub func __errno_location() -> ?&mut int32;
88
}
99

10-
public const EDOM := 33;
11-
public const EILSEQ := 84;
12-
public const ERANGE := 34;
10+
pub const EDOM := 33;
11+
pub const EILSEQ := 84;
12+
pub const ERANGE := 34;
1313
#endif
1414

1515
#if _WINDOWS_
1616
extern (C) {
1717
[dllimport]
18-
public func _errno() &mut int32;
18+
pub func _errno() &mut int32;
1919
}
2020

21-
public const EDOM := 33;
22-
public const EILSEQ := 42;
23-
public const ERANGE := 34;
21+
pub const EDOM := 33;
22+
pub const EILSEQ := 42;
23+
pub const ERANGE := 34;
2424
#endif

lib/c/src/libc/mod.ri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
// be found in the LICENSE file.
44

55
extern (C) {
6-
public var environ: [&][&]uint8;
6+
pub var environ: [&][&]uint8;
77
}

0 commit comments

Comments
 (0)