Rust: Polish off communication across Mojom interfaces

mojom/generators/rust/rustgen/source.go

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package rustgen
 
 import (
         "log"
         "sort"
         "strconv"
@@ skipping 64 matching lines @@
         Value int64
 }
 
 type EnumTemplate struct {
         Name string
         // In declaration order.
         Values []EnumValueTemplate
         Signed bool
 }
 
+type EndpointTemplate struct {
+        Name string
+        Interface string
+}
+
 type InterfaceMessageTemplate struct {
         Name string
         // This is the ordinal name (denoted by '@x' in the IDL).
         MessageOrdinal uint32
         MinVersion     uint32
         RequestStruct  StructTemplate
         // ResponseStruct.Name == "" if response not defined.
         ResponseStruct StructTemplate
 }
 
 type InterfaceTemplate struct {
         Name        string
         ServiceName string
+        Client      EndpointTemplate
+        Server      EndpointTemplate
         Version     uint32
         Messages    []InterfaceMessageTemplate
         Enums       []EnumTemplate
         Constants   []ConstantTemplate
 }
 
 // The type, name and initial value of the constant.
 // Describes mojom constants declared top level, in structs, and in
 // interfaces.
 type ConstantTemplate struct {
@@ skipping 181 matching lines @@
         }
         return
 }
 
 func NewInterfaceTemplate(context *Context, mojomInterface *mojom_types.MojomInterface) InterfaceTemplate {
         interface_name := mojomToRustName(mojomInterface.DeclData, context)
         var service_name string
         if mojomInterface.ServiceName != nil {
                 service_name = *mojomInterface.ServiceName
         }
+        client := EndpointTemplate{
+                Name: interface_name + "Client",
+                Interface: interface_name,
+        }
+        server := EndpointTemplate{
+                Name: interface_name + "Server",
+                Interface: interface_name,
+        }
 
         // Generate templates for the containing constants and enums
         var constants []ConstantTemplate
         var enums []EnumTemplate
         if decls := mojomInterface.DeclData.ContainedDeclarations; decls != nil {
                 constants, enums = generateContainedDeclarations(context, decls)
         }
 
         var msgs []InterfaceMessageTemplate
         for _, mojomMethod := range mojomInterface.Methods {
                 msg_name := assertNotReservedKeyword(interface_name + *mojomMethod.DeclData.ShortName)
                 req_struct := NewStructTemplate(context, &mojomMethod.Parameters)
                 req_struct.Name = interface_name + req_struct.Name
 
                 var resp_struct StructTemplate
                 if mojomMethod.ResponseParams != nil {
                         resp_struct = NewStructTemplate(context, mojomMethod.ResponseParams)
                         resp_struct.Name = interface_name + resp_struct.Name
                 }
 
                 msgs = append(msgs, InterfaceMessageTemplate{
                         Name:           msg_name,
                         MessageOrdinal: mojomMethod.Ordinal,
                         MinVersion:     mojomMethod.MinVersion,
                         RequestStruct:  req_struct,
                         ResponseStruct: resp_struct,
                 })
         }
-
         return InterfaceTemplate{
                 Name:        interface_name,
                 ServiceName: service_name,
+                Client:      client,
+                Server:      server,
                 Version:     mojomInterface.CurrentVersion,
                 Enums:       enums,
                 Constants:   constants,
                 Messages:    msgs,
         }
 }
 
 // TODO(vardhan): We can make this function, along with all other New*Template()
 // functions, be a method for InterfaceTemplate so that we don't have to pass
 // around |fileGraph| all over the place.
@@ skipping 117 matching lines @@
 
         return SourceTemplate{
                 Constants:   constants,
                 Structs:     structs,
                 Unions:      unions,
                 Enums:       enums,
                 Interfaces:  interfaces,
         }
 }