Skip to content

Be more consistent with if let / guard let shorthand #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stackotter merged 2 commits into from
Jan 5, 2026
Merged

Be more consistent with if let / guard let shorthand #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f7f7d1
be more consistent with `if let` / `guard let` shorthand
kaascevich Jan 5, 2026
17e33c7
add missing `return` to guard statement
kaascevich Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Gtk/Application.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class Application: GObject, GActionMap {

addSignal(name: "open", handler: gCallback(handler1)) {
[weak self] (files: UnsafeMutablePointer<OpaquePointer>, nFiles: Int) in
guard let self = self else { return }
guard let self else { return }
var uris: [URL] = []
for i in 0..<nFiles {
uris.append(
Expand Down
20 changes: 10 additions & 10 deletions Sources/Gtk/Generated/Button.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ open class Button: Widget, Actionable {
super.didMoveToParent()

addSignal(name: "activate") { [weak self] () in
guard let self = self else { return }
guard let self else { return }
self.activate?(self)
}

addSignal(name: "clicked") { [weak self] () in
guard let self = self else { return }
guard let self else { return }
self.clicked?(self)
}

Expand All @@ -97,7 +97,7 @@ open class Button: Widget, Actionable {

addSignal(name: "notify::can-shrink", handler: gCallback(handler2)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyCanShrink?(self, param0)
}

Expand All @@ -109,7 +109,7 @@ open class Button: Widget, Actionable {

addSignal(name: "notify::child", handler: gCallback(handler3)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyChild?(self, param0)
}

Expand All @@ -121,7 +121,7 @@ open class Button: Widget, Actionable {

addSignal(name: "notify::has-frame", handler: gCallback(handler4)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyHasFrame?(self, param0)
}

Expand All @@ -133,7 +133,7 @@ open class Button: Widget, Actionable {

addSignal(name: "notify::icon-name", handler: gCallback(handler5)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyIconName?(self, param0)
}

Expand All @@ -145,7 +145,7 @@ open class Button: Widget, Actionable {

addSignal(name: "notify::label", handler: gCallback(handler6)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyLabel?(self, param0)
}

Expand All @@ -157,7 +157,7 @@ open class Button: Widget, Actionable {

addSignal(name: "notify::use-underline", handler: gCallback(handler7)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyUseUnderline?(self, param0)
}

Expand All @@ -169,7 +169,7 @@ open class Button: Widget, Actionable {

addSignal(name: "notify::action-name", handler: gCallback(handler8)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyActionName?(self, param0)
}

Expand All @@ -181,7 +181,7 @@ open class Button: Widget, Actionable {

addSignal(name: "notify::action-target", handler: gCallback(handler9)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyActionTarget?(self, param0)
}
}
Expand Down
20 changes: 10 additions & 10 deletions Sources/Gtk/Generated/CheckButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ open class CheckButton: Widget, Actionable {
super.didMoveToParent()

addSignal(name: "activate") { [weak self] () in
guard let self = self else { return }
guard let self else { return }
self.activate?(self)
}

addSignal(name: "toggled") { [weak self] () in
guard let self = self else { return }
guard let self else { return }
self.toggled?(self)
}

Expand All @@ -106,7 +106,7 @@ open class CheckButton: Widget, Actionable {

addSignal(name: "notify::active", handler: gCallback(handler2)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyActive?(self, param0)
}

Expand All @@ -118,7 +118,7 @@ open class CheckButton: Widget, Actionable {

addSignal(name: "notify::child", handler: gCallback(handler3)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyChild?(self, param0)
}

Expand All @@ -130,7 +130,7 @@ open class CheckButton: Widget, Actionable {

addSignal(name: "notify::group", handler: gCallback(handler4)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyGroup?(self, param0)
}

Expand All @@ -142,7 +142,7 @@ open class CheckButton: Widget, Actionable {

addSignal(name: "notify::inconsistent", handler: gCallback(handler5)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyInconsistent?(self, param0)
}

Expand All @@ -154,7 +154,7 @@ open class CheckButton: Widget, Actionable {

addSignal(name: "notify::label", handler: gCallback(handler6)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyLabel?(self, param0)
}

Expand All @@ -166,7 +166,7 @@ open class CheckButton: Widget, Actionable {

addSignal(name: "notify::use-underline", handler: gCallback(handler7)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyUseUnderline?(self, param0)
}

Expand All @@ -178,7 +178,7 @@ open class CheckButton: Widget, Actionable {

addSignal(name: "notify::action-name", handler: gCallback(handler8)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyActionName?(self, param0)
}

Expand All @@ -190,7 +190,7 @@ open class CheckButton: Widget, Actionable {

addSignal(name: "notify::action-target", handler: gCallback(handler9)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyActionTarget?(self, param0)
}
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/Gtk/Generated/DrawingArea.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ open class DrawingArea: Widget {

addSignal(name: "resize", handler: gCallback(handler0)) {
[weak self] (param0: Int, param1: Int) in
guard let self = self else { return }
guard let self else { return }
self.resize?(self, param0, param1)
}

Expand All @@ -109,7 +109,7 @@ open class DrawingArea: Widget {

addSignal(name: "notify::content-height", handler: gCallback(handler1)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyContentHeight?(self, param0)
}

Expand All @@ -121,7 +121,7 @@ open class DrawingArea: Widget {

addSignal(name: "notify::content-width", handler: gCallback(handler2)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyContentWidth?(self, param0)
}
}
Expand Down
22 changes: 11 additions & 11 deletions Sources/Gtk/Generated/DropDown.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ open class DropDown: Widget {
super.didMoveToParent()

addSignal(name: "activate") { [weak self] () in
guard let self = self else { return }
guard let self else { return }
self.activate?(self)
}

Expand All @@ -74,7 +74,7 @@ open class DropDown: Widget {

addSignal(name: "notify::enable-search", handler: gCallback(handler1)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyEnableSearch?(self, param0)
}

Expand All @@ -86,7 +86,7 @@ open class DropDown: Widget {

addSignal(name: "notify::expression", handler: gCallback(handler2)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyExpression?(self, param0)
}

Expand All @@ -98,7 +98,7 @@ open class DropDown: Widget {

addSignal(name: "notify::factory", handler: gCallback(handler3)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyFactory?(self, param0)
}

Expand All @@ -110,7 +110,7 @@ open class DropDown: Widget {

addSignal(name: "notify::header-factory", handler: gCallback(handler4)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyHeaderFactory?(self, param0)
}

Expand All @@ -122,7 +122,7 @@ open class DropDown: Widget {

addSignal(name: "notify::list-factory", handler: gCallback(handler5)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyListFactory?(self, param0)
}

Expand All @@ -134,7 +134,7 @@ open class DropDown: Widget {

addSignal(name: "notify::model", handler: gCallback(handler6)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyModel?(self, param0)
}

Expand All @@ -146,7 +146,7 @@ open class DropDown: Widget {

addSignal(name: "notify::search-match-mode", handler: gCallback(handler7)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifySearchMatchMode?(self, param0)
}

Expand All @@ -158,7 +158,7 @@ open class DropDown: Widget {

addSignal(name: "notify::selected", handler: gCallback(handler8)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifySelected?(self, param0)
}

Expand All @@ -170,7 +170,7 @@ open class DropDown: Widget {

addSignal(name: "notify::selected-item", handler: gCallback(handler9)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifySelectedItem?(self, param0)
}

Expand All @@ -182,7 +182,7 @@ open class DropDown: Widget {

addSignal(name: "notify::show-arrow", handler: gCallback(handler10)) {
[weak self] (param0: OpaquePointer) in
guard let self = self else { return }
guard let self else { return }
self.notifyShowArrow?(self, param0)
}
}
Expand Down
Loading
Loading