Fix feature names to be publishable.

See rust-lang/cargo#5554 for more info.

Author: MaulingMonkey

jni-android-sys-gen/src/main.rs

@@ -120,12 +120,12 @@ fn generate_toml(directory: &Path, api_levels: RangeInclusive<i32>, result: &jni
 
                 // Wildcard feature "*".  While it's tempting to make this depend on all other features, this
                 // causes problems on windows where we run into command line length limits invoking rustc.
-                writeln!(out, "\"*\" = []")?;
+                writeln!(out, "\"all\" = []")?;
                 writeln!(out, "{}:END", line)?;
             },
             "# PLACEHOLDER:FEATURES:docs.rs" => {
                 writeln!(out, "{}:BEGIN", line)?;
-                writeln!(out, "features = [\"*\", \"api-level-{}\", \"force-define\"]", api_levels.end())?;
+                writeln!(out, "features = [\"all\", \"api-level-{}\", \"force-define\"]", api_levels.end())?;
                 writeln!(out, "{}:END", line)?;
             }
             line => {

jni-bindgen/src/emit_rust/fields.rs

@@ -113,7 +113,7 @@ impl<'a> Field<'a> {
                 if let Some(required_feature) = required_feature.as_ref() {
                     writeln!(out, "{}///", indent)?;
                     writeln!(out, "{}/// Required feature: {}", indent, required_feature)?;
-                    writeln!(out, "{}#[cfg(any(feature = \"*\", feature = {:?}))]", indent, required_feature)?;
+                    writeln!(out, "{}#[cfg(any(feature = \"all\", feature = {:?}))]", indent, required_feature)?;
                 }
                 match descriptor {
                     field::Descriptor::Single(field::BasicType::Char)       => writeln!(out, "{}{}pub const {} : {} = {}({});", indent, &attributes, constant, rust_type, rust_type, value)?,
@@ -130,7 +130,7 @@ impl<'a> Field<'a> {
                 if let Some(required_feature) = required_feature.as_ref() {
                     writeln!(out, "{}///", indent)?;
                     writeln!(out, "{}/// Required feature: {}", indent, required_feature)?;
-                    writeln!(out, "{}#[cfg(any(feature = \"*\", feature = {:?}))]", indent, required_feature)?;
+                    writeln!(out, "{}#[cfg(any(feature = \"all\", feature = {:?}))]", indent, required_feature)?;
                 }
                 writeln!(out, "{}{}pub fn {}<'env>({}) -> {} {{", indent, &attributes, get, env_param, rust_type)?;
                 writeln!(out, "{}    unsafe {{", indent)?;
@@ -152,7 +152,7 @@ impl<'a> Field<'a> {
                     if let Some(required_feature) = required_feature.as_ref() {
                         writeln!(out, "{}///", indent)?;
                         writeln!(out, "{}/// Required feature: {}", indent, required_feature)?;
-                        writeln!(out, "{}#[cfg(any(feature = \"*\", feature = {:?}))]", indent, required_feature)?;
+                        writeln!(out, "{}#[cfg(any(feature = \"all\", feature = {:?}))]", indent, required_feature)?;
                     }
                     writeln!(out, "{}{}pub fn {}<'env>({}, value: {}) {{", indent, &attributes, set, env_param, rust_type)?;
                     writeln!(out, "{}    unsafe {{", indent)?;

jni-bindgen/src/emit_rust/methods.rs

@@ -292,7 +292,7 @@ impl<'a> Method<'a> {
             writeln!(out, "")?;
 
             // Feature cfgs
-            write!(out, "{}#[cfg(any(feature = \"*\", all(", indent)?;
+            write!(out, "{}#[cfg(any(feature = \"all\", all(", indent)?;
             for (idx, feature) in required_features.iter().enumerate() {
                 if idx != 0 {
                     write!(out, ", ")?;

jni-bindgen/src/emit_rust/modules.rs

@@ -38,7 +38,7 @@ impl Module {
             if context.config.codegen.shard_structs {
                 if context.config.codegen.feature_per_struct {
                     match Struct::feature_for(context, structure.java.path.as_id()) {
-                        Ok(feature) => write!(out, "{}#[cfg(any(feature = \"*\", feature = {:?}))] ", indent, feature)?,
+                        Ok(feature) => write!(out, "{}#[cfg(any(feature = \"all\", feature = {:?}))] ", indent, feature)?,
                         Err(e) => {
                             writeln!(out, "{}// Unable to limit with feature: {:?}", indent, e)?;
                             write!(out, "{}", indent)?;

jni-bindgen/src/emit_rust/structs.rs

@@ -56,7 +56,7 @@ impl Struct {
         let mut buf = String::new();
         for component in class.iter() {
             match component {
-                class::IdPart::Namespace(id)        => write!(&mut buf, "{}::", rust_id(id)?)?,
+                class::IdPart::Namespace(id)        => write!(&mut buf, "{}-",  rust_id(id)?)?,
                 class::IdPart::ContainingClass(id)  => write!(&mut buf, "{}_",  rust_id(id)?)?,
                 class::IdPart::LeafClass(id)        => write!(&mut buf, "{}",   rust_id(id)?)?,
             }
@@ -157,7 +157,7 @@ impl Struct {
         if let Ok(required_feature) = Struct::feature_for(context, self.java.path.as_id()) {
             writeln!(out, "{}    ///", indent)?;
             writeln!(out, "{}    /// Required feature: {}", indent, required_feature)?;
-            writeln!(out, "{}    #[cfg(any(feature = \"*\", feature = {:?}))]", indent, required_feature)?;
+            writeln!(out, "{}    #[cfg(any(feature = \"all\", feature = {:?}))]", indent, required_feature)?;
         }
         write!(out, "{}    {}{} {} {} extends {}", indent, attributes, visibility, keyword, &self.rust.struct_name, super_path)?;
         let mut implements = false;

scripts/test.cmd

@@ -124,8 +124,8 @@
     @cd jni-android-sys-gen
     ..\target\%CONFIG%\jni-android-sys-gen generate
     @cd ../jni-android-sys
-    @call :try-cargo +%CHANNEL% build            --features "* api-level-28 force-define" %CARGO_FLAGS% || goto :build-one-error
-    @call :try-cargo +%CHANNEL% doc   --no-deps  --features "* api-level-28 force-define" %CARGO_FLAGS% || goto :build-one-error
+    @call :try-cargo +%CHANNEL% build            --features "all api-level-28 force-define" %CARGO_FLAGS% || goto :build-one-error
+    @call :try-cargo +%CHANNEL% doc   --no-deps  --features "all api-level-28 force-define" %CARGO_FLAGS% || goto :build-one-error
     @goto :build-one-successful
 :skip-windows