Revert "Automatically assume that win32_ and unix_ should use the…

… related cfg"

This reverts commit 45a6bd2.

src/analysis/constants.rs

@@ -1,6 +1,6 @@
 use std::borrow::Borrow;
 
-use crate::{config, env::Env, library, nameutil, traits::*, update_cfgs, version::Version};
+use crate::{config, env::Env, library, nameutil, traits::*, version::Version};
 
 #[derive(Debug)]
 pub struct Info {
@@ -49,7 +49,6 @@ pub fn analyze<F: Borrow<library::Constant>>(
         let cfg_condition = configured_constants
             .iter()
             .find_map(|c| c.cfg_condition.clone());
-        let cfg_condition = update_cfgs::get_constant_cfg_condition(&constant.name, &cfg_condition);
 
         let name = nameutil::mangle_keywords(&*constant.name).into_owned();
 

src/analysis/functions.rs

@@ -35,7 +35,6 @@ use crate::{
     },
     nameutil,
     traits::*,
-    update_cfgs,
     version::Version,
 };
 
@@ -652,9 +651,6 @@ fn analyze_function(
     let cfg_condition = configured_functions
         .iter()
         .find_map(|f| f.cfg_condition.clone());
-    let ns = env.library.namespace(ns_id);
-    let cfg_condition =
-        update_cfgs::get_cfg_condition(&func.name, &cfg_condition, &ns.symbol_prefixes);
     let doc_hidden = configured_functions.iter().any(|f| f.doc_hidden);
     let doc_trait_name = configured_functions
         .iter()

src/analysis/namespaces.rs

@@ -14,7 +14,6 @@ pub struct Namespace {
     pub higher_crate_name: String,
     pub package_names: Vec<String>,
     pub symbol_prefixes: Vec<String>,
-    pub identifier_prefixes: Vec<String>,
     pub shared_libs: Vec<String>,
     pub versions: Vec<Version>,
 }
@@ -59,7 +58,6 @@ pub fn run(gir: &library::Library) -> Info {
             higher_crate_name,
             package_names: ns.package_names.clone(),
             symbol_prefixes: ns.symbol_prefixes.clone(),
-            identifier_prefixes: ns.identifier_prefixes.clone(),
             shared_libs: ns.shared_library.clone(),
             versions: ns.versions.iter().copied().collect(),
         });

src/analysis/object.rs

@@ -12,7 +12,6 @@ use crate::{
     library::{self, FunctionKind},
     nameutil::*,
     traits::*,
-    update_cfgs,
 };
 
 /// The location of an item within the object
@@ -304,9 +303,6 @@ pub fn class(env: &Env, obj: &GObject, deps: &[library::TypeId]) -> Option<Info>
         imports.add("glib::prelude::*");
     }
 
-    let ns = env.library.namespace(class_tid.ns_id);
-    let cfg_condition =
-        update_cfgs::get_object_cfg_condition(&name, &obj.cfg_condition, &ns.identifier_prefixes);
     let base = InfoBase {
         full_name,
         type_id: class_tid,
@@ -316,7 +312,7 @@ pub fn class(env: &Env, obj: &GObject, deps: &[library::TypeId]) -> Option<Info>
         imports,
         version,
         deprecated_version,
-        cfg_condition,
+        cfg_condition: obj.cfg_condition.clone(),
         concurrency: obj.concurrency,
         visibility: obj.visibility,
     };
@@ -433,9 +429,6 @@ pub fn interface(env: &Env, obj: &GObject, deps: &[library::TypeId]) -> Option<I
         deps,
     );
 
-    let ns = env.library.namespace(iface_tid.ns_id);
-    let cfg_condition =
-        update_cfgs::get_object_cfg_condition(&name, &obj.cfg_condition, &ns.identifier_prefixes);
     let base = InfoBase {
         full_name,
         type_id: iface_tid,
@@ -445,7 +438,7 @@ pub fn interface(env: &Env, obj: &GObject, deps: &[library::TypeId]) -> Option<I
         imports,
         version,
         deprecated_version,
-        cfg_condition,
+        cfg_condition: obj.cfg_condition.clone(),
         concurrency: obj.concurrency,
         visibility: obj.visibility,
     };

src/analysis/record.rs

@@ -12,7 +12,6 @@ use crate::{
     library,
     nameutil::*,
     traits::*,
-    update_cfgs,
     version::Version,
 };
 
@@ -196,10 +195,6 @@ pub fn new(env: &Env, obj: &GObject) -> Option<Info> {
         }
     }
 
-    let ns = env.library.namespace(record_tid.ns_id);
-    let cfg_condition =
-        update_cfgs::get_object_cfg_condition(&name, &obj.cfg_condition, &ns.identifier_prefixes);
-
     let base = InfoBase {
         full_name,
         type_id: record_tid,
@@ -209,7 +204,7 @@ pub fn new(env: &Env, obj: &GObject) -> Option<Info> {
         imports,
         version,
         deprecated_version,
-        cfg_condition,
+        cfg_condition: obj.cfg_condition.clone(),
         concurrency: obj.concurrency,
         visibility: obj.visibility,
     };

src/codegen/sys/fields.rs

@@ -4,7 +4,6 @@ use crate::{
     env::Env,
     library::*,
     traits::{IntoString, MaybeRefAs},
-    update_cfgs,
 };
 
 pub struct Fields {
@@ -165,13 +164,10 @@ fn field_ffi_type(env: &Env, field: &Field) -> Result {
 }
 
 fn get_gobject_cfg_condition(env: &Env, name: &str) -> Option<String> {
-    let ns = env.namespaces.main();
-    let full_name = format!("{}.{}", ns.name, name);
-    env.config
-        .objects
-        .get(&full_name)
-        .and_then(|obj| {
-            update_cfgs::get_object_cfg_condition(name, &obj.cfg_condition, &ns.identifier_prefixes)
-        })
-        .or_else(|| update_cfgs::get_object_cfg_condition(name, &None, &ns.identifier_prefixes))
+    let full_name = format!("{}.{}", env.namespaces.main().name, name);
+    if let Some(obj) = env.config.objects.get(&full_name) {
+        obj.cfg_condition.clone()
+    } else {
+        None
+    }
 }

src/codegen/sys/functions.rs

@@ -10,7 +10,6 @@ use crate::{
     env::Env,
     library, nameutil,
     traits::*,
-    update_cfgs,
 };
 
 // used as glib:get-type in GLib-2.0.gir
@@ -181,19 +180,13 @@ pub fn generate_other_funcs(
 
 fn generate_cfg_configure(
     w: &mut dyn Write,
-    env: &Env,
-    function_name: &str,
     configured_functions: &[&Function],
     commented: bool,
 ) -> Result<()> {
-    let ns = env.namespaces.main();
     let cfg_condition_ = configured_functions
         .iter()
-        .find_map(|f| {
-            update_cfgs::get_cfg_condition(function_name, &f.cfg_condition, &ns.symbol_prefixes)
-        })
-        .or_else(|| update_cfgs::get_cfg_condition(function_name, &None, &ns.symbol_prefixes));
-    cfg_condition(w, cfg_condition_.as_ref(), commented, 1)?;
+        .find_map(|f| f.cfg_condition.as_ref());
+    cfg_condition(w, cfg_condition_, commented, 1)?;
     Ok(())
 }
 
@@ -231,7 +224,7 @@ fn generate_object_funcs(
                 .max()
                 .flatten();
             version_condition(w, env, None, version, false, 1)?;
-            generate_cfg_configure(w, env, glib_get_type, &configured_functions, false)?;
+            generate_cfg_configure(w, &configured_functions, false)?;
             writeln!(w, "    pub fn {glib_get_type}() -> GType;")?;
         }
     }
@@ -261,7 +254,7 @@ fn generate_object_funcs(
 
         version_condition(w, env, None, version, commented, 1)?;
         let name = func.c_identifier.as_ref().unwrap();
-        generate_cfg_configure(w, env, name, &configured_functions, commented)?;
+        generate_cfg_configure(w, &configured_functions, commented)?;
         writeln!(w, "    {comment}pub fn {name}{sig};")?;
     }
 

src/codegen/sys/lib_.rs

@@ -14,7 +14,6 @@ use crate::{
     library::*,
     nameutil::*,
     traits::*,
-    update_cfgs,
 };
 
 pub fn generate(env: &Env) {
@@ -181,8 +180,7 @@ fn generate_aliases(w: &mut dyn Write, env: &Env, items: &[&Alias]) -> Result<()
         writeln!(w, "// Aliases")?;
     }
     for item in items {
-        let ns = env.namespaces.main();
-        let full_name = format!("{}.{}", ns.name, item.name);
+        let full_name = format!("{}.{}", env.namespaces.main().name, item.name);
         if !env.type_status_sys(&full_name).need_generate() {
             continue;
         }
@@ -194,17 +192,8 @@ fn generate_aliases(w: &mut dyn Write, env: &Env, items: &[&Alias]) -> Result<()
             .config
             .objects
             .get(&full_name)
-            .and_then(|obj| {
-                update_cfgs::get_object_cfg_condition(
-                    &item.name,
-                    &obj.cfg_condition,
-                    &ns.identifier_prefixes,
-                )
-            })
-            .or_else(|| {
-                update_cfgs::get_object_cfg_condition(&item.name, &None, &ns.identifier_prefixes)
-            });
-        cfg_condition(w, cfg_condition_.as_ref(), false, 0)?;
+            .and_then(|obj| obj.cfg_condition.as_ref());
+        cfg_condition(w, cfg_condition_, false, 0)?;
         writeln!(w, "{}pub type {} = {};", comment, item.c_identifier, c_type)?;
     }
     if !items.is_empty() {
@@ -251,15 +240,13 @@ fn generate_bitfields(w: &mut dyn Write, env: &Env, items: &[&Bitfield]) -> Resu
 
 fn generate_constant_cfg_configure(
     w: &mut dyn Write,
-    constant: &Constant,
     configured_constants: &[&constants::Constant],
     commented: bool,
 ) -> Result<()> {
     let cfg_condition_ = configured_constants
         .iter()
-        .find_map(|f| update_cfgs::get_constant_cfg_condition(&constant.name, &f.cfg_condition))
-        .or_else(|| update_cfgs::get_constant_cfg_condition(&constant.name, &None));
-    cfg_condition(w, cfg_condition_.as_ref(), commented, 1)?;
+        .find_map(|f| f.cfg_condition.as_ref());
+    cfg_condition(w, cfg_condition_, commented, 1)?;
     Ok(())
 }
 
@@ -299,12 +286,7 @@ fn generate_constants(w: &mut dyn Write, env: &Env, constants: &[Constant]) -> R
 
         if let Some(obj) = config {
             let configured_constants = obj.constants.matched(&full_name);
-            generate_constant_cfg_configure(
-                w,
-                constant,
-                &configured_constants,
-                !comment.is_empty(),
-            )?;
+            generate_constant_cfg_configure(w, &configured_constants, !comment.is_empty())?;
         }
 
         writeln!(
@@ -325,8 +307,7 @@ fn generate_enums(w: &mut dyn Write, env: &Env, items: &[&Enumeration]) -> Resul
         writeln!(w, "// Enums")?;
     }
     for item in items {
-        let ns = env.namespaces.main();
-        let full_name = format!("{}.{}", ns.name, item.name);
+        let full_name = format!("{}.{}", env.namespaces.main().name, item.name);
         let config = env.config.objects.get(&full_name);
         if let Some(false) = config.map(|c| c.status.need_generate()) {
             continue;
@@ -335,17 +316,8 @@ fn generate_enums(w: &mut dyn Write, env: &Env, items: &[&Enumeration]) -> Resul
             .config
             .objects
             .get(&full_name)
-            .and_then(|obj| {
-                update_cfgs::get_object_cfg_condition(
-                    &item.name,
-                    &obj.cfg_condition,
-                    &ns.identifier_prefixes,
-                )
-            })
-            .or_else(|| {
-                update_cfgs::get_object_cfg_condition(&item.name, &None, &ns.identifier_prefixes)
-            });
-        cfg_condition(w, cfg_condition_.as_ref(), false, 0)?;
+            .and_then(|obj| obj.cfg_condition.as_ref());
+        cfg_condition(w, cfg_condition_, false, 0)?;
         writeln!(w, "pub type {} = c_int;", item.c_type)?;
         for member in &item.members {
             let member_config = config
@@ -361,7 +333,7 @@ fn generate_enums(w: &mut dyn Write, env: &Env, items: &[&Enumeration]) -> Resul
                 continue;
             }
 
-            cfg_condition(w, cfg_condition_.as_ref(), false, 0)?;
+            cfg_condition(w, cfg_condition_, false, 0)?;
             version_condition(w, env, None, version, false, 0)?;
             writeln!(
                 w,
@@ -448,32 +420,18 @@ fn generate_interfaces_structs(
         writeln!(w, "// Interfaces")?;
     }
     for interface in interfaces {
-        let ns = env.namespaces.main();
-        let full_name = format!("{}.{}", ns.name, interface.name);
+        let full_name = format!("{}.{}", env.namespaces.main().name, interface.name);
         if !env.type_status_sys(&full_name).need_generate() {
             continue;
         }
         let cfg_condition_ = env
             .config
             .objects
             .get(&full_name)
-            .and_then(|obj| {
-                update_cfgs::get_object_cfg_condition(
-                    &interface.name,
-                    &obj.cfg_condition,
-                    &ns.identifier_prefixes,
-                )
-            })
-            .or_else(|| {
-                update_cfgs::get_object_cfg_condition(
-                    &interface.name,
-                    &None,
-                    &ns.identifier_prefixes,
-                )
-            });
-        cfg_condition(w, cfg_condition_.as_ref(), false, 0)?;
+            .and_then(|obj| obj.cfg_condition.as_ref());
+        cfg_condition(w, cfg_condition_, false, 0)?;
         generate_opaque_type(w, &interface.c_type)?;
-        cfg_condition(w, cfg_condition_.as_ref(), false, 0)?;
+        cfg_condition(w, cfg_condition_, false, 0)?;
         generate_debug_impl(
             w,
             &interface.c_type,
@@ -548,25 +506,15 @@ impl ::std::fmt::Debug for GHookList {
 }
 
 fn generate_disguised(w: &mut dyn Write, env: &Env, record: &Record) -> Result<()> {
-    let ns = env.namespaces.main();
-    let full_name = format!("{}.{}", ns.name, record.name);
+    let full_name = format!("{}.{}", env.namespaces.main().name, record.name);
     let cfg_condition_ = env
         .config
         .objects
         .get(&full_name)
-        .and_then(|obj| {
-            update_cfgs::get_object_cfg_condition(
-                &record.name,
-                &obj.cfg_condition,
-                &ns.identifier_prefixes,
-            )
-        })
-        .or_else(|| {
-            update_cfgs::get_object_cfg_condition(&record.name, &None, &ns.identifier_prefixes)
-        });
-    cfg_condition(w, cfg_condition_.as_ref(), false, 0)?;
+        .and_then(|obj| obj.cfg_condition.as_ref());
+    cfg_condition(w, cfg_condition_, false, 0)?;
     generate_opaque_type(w, &format!("_{}", record.c_type))?;
-    cfg_condition(w, cfg_condition_.as_ref(), false, 0)?;
+    cfg_condition(w, cfg_condition_, false, 0)?;
     if record.pointer {
         writeln!(w, "pub type {name} = *mut _{name};", name = record.c_type)?;
     } else {

src/config/functions.rs

@@ -344,7 +344,10 @@ impl Parse for Function {
             .lookup("version")
             .and_then(Value::as_str)
             .and_then(|s| s.parse().ok());
-        let cfg_condition = super::get_cfg_condition(toml, object_name);
+        let cfg_condition = toml
+            .lookup("cfg_condition")
+            .and_then(Value::as_str)
+            .map(ToOwned::to_owned);
         let parameters = Parameters::parse(toml.lookup("parameter"), object_name);
         let ret = Return::parse(toml.lookup("return"), object_name);
         let doc_hidden = toml

src/config/gobjects.rs

@@ -330,7 +330,10 @@ fn parse_object(
         .lookup("version")
         .and_then(Value::as_str)
         .and_then(|s| s.parse().ok());
-    let cfg_condition = super::get_object_cfg_condition(toml_object, &name);
+    let cfg_condition = toml_object
+        .lookup("cfg_condition")
+        .and_then(Value::as_str)
+        .map(ToOwned::to_owned);
     let generate_trait = toml_object.lookup("trait").and_then(Value::as_bool);
     let final_type = toml_object
         .lookup("final_type")