Skip to content

Commit 4c78def

Browse files
committed
rowing back on the "public" modifier
we discussed this internally and do not see any use of adding it, but instead it screws with the modifiers of a lot of classes.
1 parent b7e1ded commit 4c78def

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

Tests/ExpectedCode/ExampleA.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import Swinject
44

55
extension ResolverType {
66

7-
public func resolvePersonType() -> PersonType {
7+
func resolvePersonType() -> PersonType {
88
return self.resolve(PersonType.self)!
99
}
1010
}
1111

1212
extension Container {
1313

14-
@discardableResult public func registerPersonType(registerClosure: (_ resolver: ResolverType) -> (PersonType)) -> ServiceEntry<PersonType> {
14+
@discardableResult func registerPersonType(registerClosure: (_ resolver: ResolverType) -> (PersonType)) -> ServiceEntry<PersonType> {
1515
return self.register(PersonType.self, factory: registerClosure)
1616
}
1717
}

Tests/ExpectedCode/ExampleB.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import Swinject
44

55
extension ResolverType {
66

7-
public func resolveInjectablePerson() -> InjectablePerson {
7+
func resolveInjectablePerson() -> InjectablePerson {
88
return self.resolve(PersonType.self) as! InjectablePerson
99
}
1010
}
1111

1212
extension Container {
1313

14-
@discardableResult public func registerInjectablePerson(registerClosure: (_ resolver: ResolverType) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
14+
@discardableResult func registerInjectablePerson(registerClosure: (_ resolver: ResolverType) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
1515
return self.register(PersonType.self, factory: registerClosure)
1616
}
1717
}

Tests/ExpectedCode/ExampleC.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import Swinject
44

55
extension ResolverType {
66

7-
public func resolveInjectablePerson_initializer() -> InjectablePerson {
7+
func resolveInjectablePerson_initializer() -> InjectablePerson {
88
return self.resolve(PersonType.self, name: "initializer") as! InjectablePerson
99
}
1010
}
1111

1212
extension Container {
1313

14-
@discardableResult public func registerInjectablePerson_initializer(registerClosure: (_ resolver: ResolverType) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
14+
@discardableResult func registerInjectablePerson_initializer(registerClosure: (_ resolver: ResolverType) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
1515
return self.register(PersonType.self, name: "initializer", factory: registerClosure)
1616
}
1717
}

Tests/ExpectedCode/ExampleD.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import Swinject
44

55
extension ResolverType {
66

7-
public func resolveInjectablePerson(argumentName: ArgumentType) -> InjectablePerson {
7+
func resolveInjectablePerson(argumentName: ArgumentType) -> InjectablePerson {
88
return self.resolve(PersonType.self, argument: argumentName) as! InjectablePerson
99
}
1010
}
1111

1212
extension Container {
1313

14-
@discardableResult public func registerInjectablePerson(registerClosure: (_ resolver: ResolverType, _ argumentName: ArgumentType) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
14+
@discardableResult func registerInjectablePerson(registerClosure: (_ resolver: ResolverType, _ argumentName: ArgumentType) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
1515
return self.register(PersonType.self, factory: registerClosure)
1616
}
1717
}

Tests/ExpectedCode/ExampleE.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import Swinject
44

55
extension ResolverType {
66

7-
public func resolveInjectablePerson(argumentName: ArgumentType, argumenttypewithoutspecificname: ArgumentTypeWithoutSpecificName, title: String, string: String) -> InjectablePerson {
7+
func resolveInjectablePerson(argumentName: ArgumentType, argumenttypewithoutspecificname: ArgumentTypeWithoutSpecificName, title: String, string: String) -> InjectablePerson {
88
return self.resolve(PersonType.self, arguments: argumentName, argumenttypewithoutspecificname, title, string) as! InjectablePerson
99
}
1010
}
1111

1212
extension Container {
1313

14-
@discardableResult public func registerInjectablePerson(registerClosure: (_ resolver: ResolverType, _ argumentName: ArgumentType, _ argumenttypewithoutspecificname: ArgumentTypeWithoutSpecificName, _ title: String, _ string: String) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
14+
@discardableResult func registerInjectablePerson(registerClosure: (_ resolver: ResolverType, _ argumentName: ArgumentType, _ argumenttypewithoutspecificname: ArgumentTypeWithoutSpecificName, _ title: String, _ string: String) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
1515
return self.register(PersonType.self, factory: registerClosure)
1616
}
1717
}

Tests/ExpectedCode/ExampleF.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import Swinject
44

55
extension ResolverType {
66

7-
public func resolveInjectablePerson_initializer(argumentName: ArgumentType, argumenttypewithoutspecificname: ArgumentTypeWithoutSpecificName, title: String, string: String) -> InjectablePerson {
7+
func resolveInjectablePerson_initializer(argumentName: ArgumentType, argumenttypewithoutspecificname: ArgumentTypeWithoutSpecificName, title: String, string: String) -> InjectablePerson {
88
return self.resolve(PersonType.self, name: "initializer", arguments: argumentName, argumenttypewithoutspecificname, title, string) as! InjectablePerson
99
}
1010
}
1111

1212
extension Container {
1313

14-
@discardableResult public func registerInjectablePerson_initializer(registerClosure: (_ resolver: ResolverType, _ argumentName: ArgumentType, _ argumenttypewithoutspecificname: ArgumentTypeWithoutSpecificName, _ title: String, _ string: String) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
14+
@discardableResult func registerInjectablePerson_initializer(registerClosure: (_ resolver: ResolverType, _ argumentName: ArgumentType, _ argumenttypewithoutspecificname: ArgumentTypeWithoutSpecificName, _ title: String, _ string: String) -> (InjectablePerson)) -> ServiceEntry<PersonType> {
1515
return self.register(PersonType.self, name: "initializer", factory: registerClosure)
1616
}
1717
}

erb/container.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import Swinject
88

99
extension ResolverType {
1010
<% @content_array.each do |hash| %>
11-
public func <%= hash[:resolve_function_signature] %> {
11+
func <%= hash[:resolve_function_signature] %> {
1212
return self<%= hash[:resolve_function_call] %><%= ", argument: #{hash[:arguments][0][:argument_name]}" if !hash[:arguments].nil? && hash[:arguments].count == 1 -%><%= ", arguments: #{hash[:arguments].map {|a| a[:argument_name]}.join(", ")}" if !hash[:arguments].nil? && hash[:arguments].count > 1 -%>)<%=hash[:service] != hash[:component] ? " as! #{hash[:component]}" : "!"%>
1313
}
1414
<% end -%>
1515
}
1616

1717
extension Container {
1818
<% @content_array.each do |hash| %>
19-
@discardableResult public func <%= hash[:register_function_signature] %> {
19+
@discardableResult func <%= hash[:register_function_signature] %> {
2020
return self<%= hash[:register_function_call] %> factory: registerClosure)
2121
}
2222
<% end -%>

0 commit comments

Comments
 (0)