Skip to content

Commit

Permalink
more void -> null renames
Browse files Browse the repository at this point in the history
  • Loading branch information
annacrombie committed Dec 17, 2024
1 parent 9c63eca commit cc34b21
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/script/modules/_test.meson
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ func returns_string() -> str
return '10'
endfunc

# this should return void and muon should not raise an error stating that
# this should return null and muon should not raise an error stating that
# it expected a return of 'str' due to the internal call to `returns_string`
func returns_void()
func returns_null()
val_str = returns_string()
message(val_str)
endfunc
Expand All @@ -131,6 +131,6 @@ return {
'glob_arg': glob_arg,
'typed_list': typed_list,
'multi_return': multi_return,
'returns_void': returns_void,
'returns_null': returns_null,
'project': project,
}
2 changes: 1 addition & 1 deletion src/script/modules/gnome.meson
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: sewn <[email protected]>
# SPDX-License-Identifier: GPL-3.0-only

# TODO: investigate void kwarg in custom_target
# TODO: investigate null kwarg in custom_target

fs = import('fs')

Expand Down
2 changes: 1 addition & 1 deletion src/script/modules/i18n.meson
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func read_linguas(source_dir str) -> list[any]
return languages
endfunc

func get_data_dirs(source_dir str, dirs list[str]|void) -> str
func get_data_dirs(source_dir str, dirs list[str]|null) -> str

if is_null(dirs)
return ''
Expand Down
2 changes: 1 addition & 1 deletion tests/project/muon/script_module/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ assert(m.multi_return('b') == 2)
assert(m.multi_return('c') == 0)

# test internal calls not changing interpreter state.
m.returns_void()
m.returns_null()

# test meson.project()
p(m.project())
Expand Down

0 comments on commit cc34b21

Please sign in to comment.