Merge #841

841: Updates necessary for the language server r=Marwes a=Marwes



Co-authored-by: Markus Westerlind <[email protected]>
Co-authored-by: Markus Westerlind <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="v0.15.1"></a>
+### v0.15.1 (2020-06-20)
+
+
+#### Bug Fixes
+
+*   Allow find_type etc to work without calling global ([6e469b9a](https://github.com/gluon-lang/gluon/commit/6e469b9a311d1bdb7b5e4fc62688fc7d4d08ceea))
+
+#### Features
+
+*   Make the query code compatible with the language server ([14e8f1de](https://github.com/gluon-lang/gluon/commit/14e8f1ded3f4e02d6b8ab9c50dbd29b35b534996))
+*   Add Default for Root/OwnedExpr ([fedb7322](https://github.com/gluon-lang/gluon/commit/fedb732270eb24e544b047e19e5a7533028a2f5b))
+
+
+
 <a name="v0.15.0"></a>
 ## v0.15.0 (2020-06-06)
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "gluon"
-version = "0.15.0" # GLUON
+version = "0.15.1" # GLUON
 authors = ["Markus <[email protected]>"]
 keywords = ["script", "scripting", "language"]
 build = "build.rs"
@@ -26,12 +26,12 @@ name = "gluon"
 path = "src/lib.rs"
 
 [dependencies]
-gluon_base = { path = "base", version = "0.15.0" } # GLUON
-gluon_check = { path = "check", version = "0.15.0" } # GLUON
-gluon_parser = { path = "parser", version = "0.15.0" } # GLUON
-gluon_codegen = { path = "codegen", version = "0.15.0" } # GLUON
-gluon_vm = { path = "vm", version = "0.15.0", default-features = false } # GLUON
-gluon_format = { path = "format", version = "0.15.0", default-features = false } # GLUON
+gluon_base = { path = "base", version = "0.15.1" } # GLUON
+gluon_check = { path = "check", version = "0.15.1" } # GLUON
+gluon_parser = { path = "parser", version = "0.15.1" } # GLUON
+gluon_codegen = { path = "codegen", version = "0.15.1" } # GLUON
+gluon_vm = { path = "vm", version = "0.15.1", default-features = false } # GLUON
+gluon_format = { path = "format", version = "0.15.1", default-features = false } # GLUON
 
 async-trait = "0.1"
 log = "0.4"
@@ -68,7 +68,7 @@ rand = { version = "0.7", optional = true }
 rand_xorshift = { version = "0.2", optional = true }
 
 [build-dependencies]
-gluon_base = { path = "base", version = "0.15.0" } # GLUON
+gluon_base = { path = "base", version = "0.15.1" } # GLUON
 
 itertools = "0.8"
 little-skeptic = { version = "0.15.0", optional = true }
@@ -95,8 +95,8 @@ bincode = "1"
 
 pulldown-cmark = "0.6"
 
-gluon_completion = { path = "completion", version = "0.15.0" } # GLUON
-gluon_codegen = { path = "codegen", version = "0.15.0" } # GLUON
+gluon_completion = { path = "completion", version = "0.15.1" } # GLUON
+gluon_codegen = { path = "codegen", version = "0.15.1" } # GLUON
 
 [features]
 default = ["regex", "random"]

Cargo.toml

@@ -303,7 +303,7 @@ Gluon requires a recent Rust compiler to build (1.9.0 or later) and is available
 
 ```toml
 [dependencies]
-gluon = "0.15.0"
+gluon = "0.15.1"
 ```
 
 ### Other languages

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "gluon_base"
-version = "0.15.0" # GLUON
+version = "0.15.1" # GLUON
 authors = ["Markus <[email protected]>"]
 edition = "2018"
 
@@ -33,7 +33,7 @@ either = "1"
 vec_map = "0.8"
 typed-arena = "1"
 
-gluon_codegen = { version = "0.15.0", path = "../codegen" } # GLUON
+gluon_codegen = { version = "0.15.1", path = "../codegen" } # GLUON
 
 serde = { version = "1.0.0", features = ["rc"], optional = true }
 serde_state = { version = "0.4.0", features = ["rc"], optional = true }

base/Cargo.toml

@@ -1287,13 +1287,45 @@ impl_ast_arena! {
     Metadata => metadata,
 }
 
+#[doc(hidden)]
+#[derive(Default)]
+pub struct InvariantLifetime<'a>(std::marker::PhantomData<fn(&'a ()) -> &'a ()>);
+
+// Copied from the compact_arena crate
+#[macro_export]
+macro_rules! mk_ast_arena {
+    ($name: ident) => {
+        let tag = $crate::ast::InvariantLifetime::default();
+        let $name = unsafe { std::sync::Arc::new($crate::ast::Arena::new(&tag)) };
+        let _guard;
+        // this doesn't make it to MIR, but ensures that borrowck will not
+        // unify the lifetimes of two macro calls by binding the lifetime to
+        // drop scope
+        if false {
+            struct Guard<'tag>(&'tag $crate::ast::InvariantLifetime<'tag>);
+            impl<'tag> ::core::ops::Drop for Guard<'tag> {
+                fn drop(&mut self) {}
+            }
+            _guard = Guard(&tag);
+        }
+    };
+}
+
 pub struct RootExpr<Id: 'static> {
     // Only used to keep `expr` alive
     #[allow(dead_code)]
     arena: Arc<Arena<'static, Id>>,
     expr: *mut SpannedExpr<'static, Id>,
 }
 
+impl<Id: 'static> Default for RootExpr<Id> {
+    fn default() -> Self {
+        mk_ast_arena!(arena);
+        let expr = arena.alloc(SpannedExpr::default());
+        RootExpr::new(arena.clone(), expr)
+    }
+}
+
 impl<Id: Eq> Eq for RootExpr<Id> {}
 impl<Id: PartialEq> PartialEq for RootExpr<Id> {
     fn eq(&self, other: &Self) -> bool {
@@ -1393,6 +1425,12 @@ pub struct OwnedExpr<Id: 'static> {
     expr: *mut SpannedExpr<'static, Id>,
 }
 
+impl<Id: 'static> Default for OwnedExpr<Id> {
+    fn default() -> Self {
+        RootExpr::default().try_into_send().ok().unwrap_or_default()
+    }
+}
+
 impl<Id: Eq> Eq for OwnedExpr<Id> {}
 impl<Id: PartialEq> PartialEq for OwnedExpr<Id> {
     fn eq(&self, other: &Self) -> bool {
@@ -1449,30 +1487,6 @@ impl<Id> OwnedExpr<Id> {
     }
 }
 
-#[doc(hidden)]
-#[derive(Default)]
-pub struct InvariantLifetime<'a>(std::marker::PhantomData<fn(&'a ()) -> &'a ()>);
-
-// Copied from the compact_arena crate
-#[macro_export]
-macro_rules! mk_ast_arena {
-    ($name: ident) => {
-        let tag = $crate::ast::InvariantLifetime::default();
-        let $name = unsafe { std::sync::Arc::new($crate::ast::Arena::new(&tag)) };
-        let _guard;
-        // this doesn't make it to MIR, but ensures that borrowck will not
-        // unify the lifetimes of two macro calls by binding the lifetime to
-        // drop scope
-        if false {
-            struct Guard<'tag>(&'tag $crate::ast::InvariantLifetime<'tag>);
-            impl<'tag> ::core::ops::Drop for Guard<'tag> {
-                fn drop(&mut self) {}
-            }
-            _guard = Guard(&tag);
-        }
-    };
-}
-
 pub trait AstClone<'ast, Id> {
     fn ast_clone(&self, arena: ArenaRef<'_, 'ast, Id>) -> Self;
 }

base/src/ast.rs

@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/gluon_base/0.15.0")] // # GLUON
+#![doc(html_root_url = "https://docs.rs/gluon_base/0.15.1")] // # GLUON
 #![allow(unknown_lints)]
 //! The base crate contains pervasive types used in the compiler such as type representations, the
 //! AST and some basic containers.

base/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "gluon_c-api"
-version = "0.15.0" # GLUON
+version = "0.15.1" # GLUON
 authors = ["Markus Westerlind <[email protected]>"]
 edition = "2018"
 
@@ -19,7 +19,7 @@ travis-ci = { repository = "gluon-lang/gluon" }
 crate-type = ["cdylib"]
 
 [dependencies]
-gluon = { version = "0.15.0", path = ".." } # GLUON
+gluon = { version = "0.15.1", path = ".." } # GLUON
 futures = "0.3"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

c-api/Cargo.toml

@@ -1,5 +1,5 @@
 //! A (WIP) C API allowing use of gluon in other langauges than Rust.
-#![doc(html_root_url = "https://docs.rs/gluon_c-api/0.15.0")] // # GLUON
+#![doc(html_root_url = "https://docs.rs/gluon_c-api/0.15.1")] // # GLUON
 
 use std::{slice, str};
 

c-api/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "gluon_check"
-version = "0.15.0" # GLUON
+version = "0.15.1" # GLUON
 authors = ["Markus <[email protected]>"]
 edition = "2018"
 
@@ -30,13 +30,13 @@ codespan-reporting = "0.3"
 
 strsim = "0.9.0"
 
-gluon_base = { path = "../base", version = "0.15.0" } # GLUON
-gluon_codegen = { path = "../codegen", version = "0.15.0" } # GLUON
+gluon_base = { path = "../base", version = "0.15.1" } # GLUON
+gluon_codegen = { path = "../codegen", version = "0.15.1" } # GLUON
 
 [dev-dependencies]
 env_logger = "0.7"
 
-gluon_parser = { path = "../parser", version = "0.15.0" } # GLUON
+gluon_parser = { path = "../parser", version = "0.15.1" } # GLUON
 gluon_format = { path = "../format", version = ">=0.9" }
 
 collect-mac = "0.1.0"