Rust module : Add support for cargo subprojects

TODO.md

@@ -0,0 +1,43 @@
+Cargo to meson.build:
+    - Completed:
+        - dependencies
+        - binaries
+        - libraries
+            - proc-macro
+        - features
+        - target cfg() paring
+
+    - TODO:
+        - links
+        - targets
+            - no support for the triple style
+        - tests being triggered when they shouldn't?
+        - build-dependencies
+        - example
+        - bench
+        - profile
+        - patch
+        - test for default_options being set correctly
+        - binaries:
+            - test for auto bin and manual bin collision
+            - targets required features
+            - doctest?
+            - bench
+        - libraries
+            - targets required features
+            - doctest?
+            - bench
+        - Add test for invalid feature names
+        - extend test 15 to cover test, exampeles, and benches
+        - is the use of a disabler() for dev-dependencies smart?
+
+Wrap
+    - TODO:
+        - workspaces
+        - fetching crates
+        - generating .wraps from crates
+
+Overall:
+    - Figure out what to do about multiple versions of the same crate
+    - Add a mechanism to test.json to verify that the correct tests are being run
+    - Come up with a better solution for subprojects affecting each-others options

mesonbuild/build.py

@@ -1796,8 +1796,8 @@ def __init__(self, name, subdir, subproject, for_machine: MachineChoice, sources
                 mlog.debug('Defaulting Rust static library target crate type to rlib')
                 self.rust_crate_type = 'rlib'
             # Don't let configuration proceed with a non-static crate type
-            elif self.rust_crate_type not in ['rlib', 'staticlib']:
-                raise InvalidArguments(f'Crate type "{self.rust_crate_type}" invalid for static libraries; must be "rlib" or "staticlib"')
+            elif self.rust_crate_type not in ['rlib', 'staticlib', 'proc-macro']:
+                raise InvalidArguments(f'Crate type "{self.rust_crate_type}" invalid for static libraries; must be "rlib", "staticlib", or "proc-macro"')
         # By default a static library is named libfoo.a even on Windows because
         # MSVC does not have a consistent convention for what static libraries
         # are called. The MSVC CRT uses libfoo.lib syntax but nothing else uses
@@ -1809,7 +1809,7 @@ def __init__(self, name, subdir, subproject, for_machine: MachineChoice, sources
             self.prefix = 'lib'
         if not hasattr(self, 'suffix'):
             if 'rust' in self.compilers:
-                if not hasattr(self, 'rust_crate_type') or self.rust_crate_type == 'rlib':
+                if not hasattr(self, 'rust_crate_type') or self.rust_crate_type in {'rlib', 'proc-macro'}:
                     # default Rust static library suffix
                     self.suffix = 'rlib'
                 elif self.rust_crate_type == 'staticlib':
@@ -1868,8 +1868,8 @@ def __init__(self, name, subdir, subproject, for_machine: MachineChoice, sources
                 mlog.debug('Defaulting Rust dynamic library target crate type to "dylib"')
                 self.rust_crate_type = 'dylib'
             # Don't let configuration proceed with a non-dynamic crate type
-            elif self.rust_crate_type not in ['dylib', 'cdylib']:
-                raise InvalidArguments(f'Crate type "{self.rust_crate_type}" invalid for dynamic libraries; must be "dylib" or "cdylib"')
+            elif self.rust_crate_type not in ['dylib', 'cdylib', 'proc-macro']:
+                raise InvalidArguments(f'Crate type "{self.rust_crate_type}" invalid for dynamic libraries; must be "dylib", "cdylib", or "proc-macro"')
         if not hasattr(self, 'prefix'):
             self.prefix = None
         if not hasattr(self, 'suffix'):

mesonbuild/cargo/__init__.py

@@ -0,0 +1,28 @@
+# SPDX-license-identifier: Apache-2.0
+# Copyright © 2020-2021 Intel Corporation
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__all__ = [
+    'HAS_TOML',
+    'ManifestInterpreter',
+]
+
+try:
+    import toml
+    del toml  # so toml isn't exposed
+    HAS_TOML = True
+except ImportError:
+    HAS_TOML = False
+else:
+    from .cargo import ManifestInterpreter