tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix error messages not printing names" am: 2ed895448b

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2477772

Change-Id: I24c36250b68c7b69363d450e1016eac82f2fc3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust 2023-03-09 00:29:28 +00:00 committed by Automerger Merge Worker
commit ef778a12ac
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
context.go
View file

@ -512,7 +512,7 @@ type ModuleFactory func() (m Module, propertyStructs []interface{})
// to global variables must be synchronized. // to global variables must be synchronized.
func (c *Context) RegisterModuleType(name string, factory ModuleFactory) { func (c *Context) RegisterModuleType(name string, factory ModuleFactory) {
if _, present := c.moduleFactories[name]; present { if _, present := c.moduleFactories[name]; present {
panic(errors.New("module type name is already registered")) panic(fmt.Errorf("module type %q is already registered", name))
} }
c.moduleFactories[name] = factory c.moduleFactories[name] = factory
} }
@ -533,7 +533,7 @@ type SingletonFactory func() Singleton
func (c *Context) RegisterSingletonType(name string, factory SingletonFactory) { func (c *Context) RegisterSingletonType(name string, factory SingletonFactory) {
for _, s := range c.singletonInfo { for _, s := range c.singletonInfo {
if s.name == name { if s.name == name {
panic(errors.New("singleton name is already registered")) panic(fmt.Errorf("singleton %q is already registered", name))
} }
} }
@ -555,7 +555,7 @@ func (c *Context) RegisterSingletonType(name string, factory SingletonFactory) {
func (c *Context) RegisterPreSingletonType(name string, factory SingletonFactory) { func (c *Context) RegisterPreSingletonType(name string, factory SingletonFactory) {
for _, s := range c.preSingletonInfo { for _, s := range c.preSingletonInfo {
if s.name == name { if s.name == name {
panic(errors.New("presingleton name is already registered")) panic(fmt.Errorf("presingleton %q is already registered", name))
} }
} }
@ -608,7 +608,7 @@ func singletonTypeName(singleton Singleton) string {
func (c *Context) RegisterTopDownMutator(name string, mutator TopDownMutator) MutatorHandle { func (c *Context) RegisterTopDownMutator(name string, mutator TopDownMutator) MutatorHandle {
for _, m := range c.mutatorInfo { for _, m := range c.mutatorInfo {
if m.name == name && m.topDownMutator != nil { if m.name == name && m.topDownMutator != nil {
panic(fmt.Errorf("mutator name %s is already registered", name)) panic(fmt.Errorf("mutator %q is already registered", name))
} }
} }
@ -635,7 +635,7 @@ func (c *Context) RegisterTopDownMutator(name string, mutator TopDownMutator) Mu
func (c *Context) RegisterBottomUpMutator(name string, mutator BottomUpMutator) MutatorHandle { func (c *Context) RegisterBottomUpMutator(name string, mutator BottomUpMutator) MutatorHandle {
for _, m := range c.variantMutatorNames { for _, m := range c.variantMutatorNames {
if m == name { if m == name {
panic(fmt.Errorf("mutator name %s is already registered", name)) panic(fmt.Errorf("mutator %q is already registered", name))
} }
} }