Merge pull request #222 from mozilla/moz-vendor

Update mp4parse_capi for standard mozilla vendoring

Author: baumanj

Cargo.toml

@@ -2,7 +2,6 @@
 members = [
     "mp4parse",
     "mp4parse_capi",
-    "test_ffi",
 ]
 
 [profile.release]

README.md

@@ -17,10 +17,6 @@ API is intended to wrap the rust parser. As such, features should primarily
 be implemented in the rust parser and exposed via the C API, rather than the C
 API implementing features on its own.
 
-`test_ffi` builds and links `test_ffi/src/test.cc` into a small Rust test
-harness in `test_ffi/src/main.rs` that verifies the C API against the
-generated `mp4parse.h`.
-
 ## Tests
 
 Test coverage comes from several sources:

mp4parse_capi/Cargo.toml

@@ -19,9 +19,6 @@ exclude = [
   "*.mp4",
 ]
 
-[lib]
-crate-type = ["lib", "cdylib"]
-
 [badges]
 travis-ci = { repository = "https://github.com/mozilla/mp4parse-rust" }
 
@@ -34,9 +31,6 @@ num-traits = "0.2.0"
 [dev-dependencies]
 env_logger = "0.7.1"
 
-[build-dependencies]
-cbindgen = "0.5.2"
-
 [features]
 # Enable mp4parse_fallible to use fallible memory allocation rather than
 # panicking on OOM.  Note that this is only safe within Gecko where the system

mp4parse_capi/build.rs

@@ -0,0 +1,17 @@
+header = """/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */"""
+autogen_warning = """/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen. */
+#ifndef mp4parse_rust_mp4parse_h
+#error "Don't include this file directly, instead include mp4parse.h"
+#endif
+"""
+include_version = true
+braces = "SameLine"
+line_length = 100
+tab_width = 2
+language = "C"
+cpp_compat = true
+
+[enum]
+rename_variants = "QualifiedScreamingSnakeCase"