Rust: emit Const bodies in library mode

Author: Paolo Tranquilli

rust/ast-generator/src/main.rs

@@ -262,7 +262,7 @@ fn get_additional_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
         "FormatArgsExpr" => vec![FieldInfo::list("args", "FormatArgsArg")],
         "ArgList" => vec![FieldInfo::list("args", "Expr")],
         "Fn" => vec![FieldInfo::body("body", "BlockExpr")],
-        "Const" => vec![FieldInfo::body("body", "Expr")],
+        "Const" => vec![FieldInfo::optional("body", "Expr")],
         "Static" => vec![FieldInfo::body("body", "Expr")],
         "Param" => vec![FieldInfo::body("pat", "Pat")],
         "ClosureExpr" => vec![FieldInfo::optional("body", "Expr")],

rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/old.dbscheme renamed to rust/downgrades/4c9e5cb1500c9a87fedcb13a125cb17fa2b21523/old.dbscheme

@@ -2816,11 +2816,6 @@ const_visibilities(
   int visibility: @visibility ref
 );
 
-#keyset[id]
-const_has_implementation(
-  int id: @const ref
-);
-
 enums(
   unique int id: @enum
 );

rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/rust.dbscheme renamed to rust/downgrades/4c9e5cb1500c9a87fedcb13a125cb17fa2b21523/rust.dbscheme

@@ -0,0 +1,4 @@
+description: Remove `function_has_implementation` table
+compatibility: full
+
+function_has_implementation.rel: delete

rust/downgrades/4c9e5cb1500c9a87fedcb13a125cb17fa2b21523/upgrade.properties

@@ -84,9 +84,6 @@ macro_rules! post_emit {
     (PathSegment, $self:ident, $node:ident, $label:ident) => {
         $self.extract_types_from_path_segment($node, $label.into());
     };
-    (Const, $self:ident, $node:ident, $label:ident) => {
-        $self.emit_const_has_implementation($node, $label);
-    };
     ($($_:tt)*) => {};
 }
 
@@ -775,14 +772,4 @@ impl<'a> Translator<'a> {
             generated::Function::emit_has_implementation(label, &mut self.trap.writer);
         }
     }
-
-    pub(crate) fn emit_const_has_implementation(
-        &mut self,
-        node: &ast::Const,
-        label: Label<generated::Const>,
-    ) {
-        if node.body().is_some() {
-            generated::Const::emit_has_implementation(label, &mut self.trap.writer);
-        }
-    }
 }

rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/upgrade.properties

@@ -2816,11 +2816,6 @@ const_visibilities(
   int visibility: @visibility ref
 );
 
-#keyset[id]
-const_has_implementation(
-  int id: @const ref
-);
-
 enums(
   unique int id: @enum
 );

rust/extractor/src/generated/.generated.list

@@ -2816,11 +2816,6 @@ const_visibilities(
   int visibility: @visibility ref
 );
 
-#keyset[id]
-const_has_implementation(
-  int id: @const ref
-);
-
 enums(
   unique int id: @enum
 );

rust/extractor/src/generated/top.rs

@@ -1,5 +1,4 @@
-description: Add `function_has_implementation` and `const_has_implementation` tables
+description: Add `function_has_implementation` table
 compatibility: backwards
 
-function_has_implementation.rel: run upgrade.ql new_function_has_implementation
-const_has_implementation.rel: run upgrade.ql new_const_has_implementation
+function_has_implementation.rel: reorder function_bodies.rel (@function id, @block_expr body) id

rust/extractor/src/translate/base.rs

@@ -951,10 +951,6 @@ class _:
     todo!()
     ```
     """
-    has_implementation: predicate | doc("this constant has an implementation") | desc("""
-      This is the same as `hasBody` for source code, but for library code (for which we always skip
-      the body), this will hold when the body was present in the original code.
-    """) | rust.detach
 
 
 @annotate(ConstArg)