Rename cfg to target_os

Author: lucic71

cpp2rust/converter/translation_rule.cpp

@@ -130,11 +130,11 @@ TypeRule ParseTypeRuleJSON(const llvm::json::Object &obj) {
   return rule;
 }
 
-bool CfgMatchesHost(llvm::StringRef cfg) {
+bool TargetOSMatchesHost(llvm::StringRef target_os) {
 #if defined(__linux__)
-  return cfg == "linux";
+  return target_os == "linux";
 #elif defined(__APPLE__)
-  return cfg == "macos";
+  return target_os == "macos";
 #else
   return false;
 #endif
@@ -163,7 +163,8 @@ void LoadTgtFromIR(ExprRules &exprs, TypeRules &types,
     if (!obj)
       continue;
 
-    if (auto cfg = obj->getString("cfg"); cfg && !CfgMatchesHost(*cfg)) {
+    if (auto target_os = obj->getString("target_os");
+        target_os && !TargetOSMatchesHost(*target_os)) {
       continue;
     }
 

rule-preprocessor/src/ir.rs

@@ -50,7 +50,7 @@ pub struct TypeInfo {
 pub struct FnIr {
     pub body: Vec<BodyFragment>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cfg: Option<String>,
+    pub target_os: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub generics: Option<BTreeMap<String, Vec<String>>>,
     #[serde(skip_serializing_if = "Option::is_none")]

rule-preprocessor/src/syntactic.rs

@@ -258,7 +258,7 @@ impl<'a> FnIrBuilder<'a> {
         Self { fn_item }
     }
 
-    fn cfg_target_os(&self) -> Option<String> {
+    fn get_target_os(&self) -> Option<String> {
         use ast::HasAttrs;
         for attr in self.fn_item.attrs() {
             let meta_text = attr.meta()?.syntax().text().to_string();
@@ -524,7 +524,7 @@ impl<'a> FnIrBuilder<'a> {
             },
             multi_statement,
             body,
-            cfg: self.cfg_target_os(),
+            target_os: self.get_target_os(),
         };
         ir.validate(&format!("{}:{}", path.display(), fn_name));
         ir

rules/socket/ir_unsafe.json

@@ -35,7 +35,7 @@
         "text": "libc::SOCK_CLOEXEC"
       }
     ],
-    "cfg": "linux",
+    "target_os": "linux",
     "return_type": {
       "type": "i32"
     }
@@ -46,7 +46,7 @@
         "text": "libc::SOCK_NONBLOCK"
       }
     ],
-    "cfg": "linux",
+    "target_os": "linux",
     "return_type": {
       "type": "i32"
     }