Merge #829

829: Release take 3 r=Marwes a=Marwes



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

Author: bors[bot]

.travis.yml

@@ -32,11 +32,11 @@ matrix:
     env: WASM=1
 
     # Only for deployment
-  - if: tag IS present
-    env:
-      - TARGET=x86_64-unknown-freebsd
-      - DEPLOY=1
-      - DISABLE_TESTS=1
+    # - if: tag IS present
+    #   env:
+    #     - TARGET=x86_64-unknown-freebsd
+    #     - DEPLOY=1
+    #     - DISABLE_TESTS=1
   - if: tag IS present
     env:
       - TARGET=x86_64-pc-windows-gnu

Cargo.lock

@@ -14,7 +14,7 @@ documentation = "https://docs.rs/gluon"
 [dependencies]
 clap = "2.22.0"
 env_logger = "0.7"
-failure = { version = "0.1", features = ["backtrace"] }
+failure = "0.1"
 futures = "0.3"
 handlebars = "2"
 itertools = "0.8"

doc/Cargo.toml

@@ -28,6 +28,7 @@ gluon_format = { version = "0.14.1", path = "../format" } # GLUON
 gluon_doc = { version = "0.14.1", path = "../doc" } # GLUON
 
 app_dirs = "1.0.0"
+failure = "0.1"
 futures = "0.3"
 tokio = { version = "0.2", features = ["rt-threaded", "rt-core", "macros", "signal"] }
 clap = "2.22.0"
@@ -39,7 +40,7 @@ rustyline = "5.0.1"
 walkdir = "2"
 codespan = "0.3"
 codespan-reporting = "0.3"
-
+quick-error = "1.0.0"
 
 serde = "1"
 serde_derive = "1"

repl/Cargo.toml

@@ -19,6 +19,7 @@ use std::{
     sync::Arc,
 };
 
+use quick_error::quick_error;
 use codespan_reporting::termcolor;
 use structopt::StructOpt;
 use walkdir::WalkDir;
@@ -28,12 +29,28 @@ use gluon::{base, parser, vm};
 use crate::base::filename_to_module;
 
 use gluon::{
-    new_vm_async, vm::thread::ThreadInternal, vm::Error as VMError, Error, Result, Thread,
+    new_vm_async, vm::thread::ThreadInternal, vm::Error as VMError, Result, Thread,
     ThreadExt,
 };
 
 mod repl;
 
+quick_error! {
+/// Error type wrapping all possible errors that can be generated from gluon
+#[derive(Debug)]
+#[allow(deprecated)]
+enum Error {
+    Failure(err: failure::Error) {
+        display("{}", err)
+        from()
+    }
+    Gluon(err: gluon::Error) {
+        display("{}", err)
+        from()
+    }
+}
+}
+
 const APP_INFO: app_dirs::AppInfo = app_dirs::AppInfo {
     name: "gluon-repl",
     author: "gluon-lang",
@@ -212,7 +229,7 @@ async fn fmt_stdio(opt: &Opt) -> Result<()> {
     Ok(())
 }
 
-async fn run(opt: &Opt, color: Color, vm: &Thread) -> std::result::Result<(), gluon::Error> {
+async fn run(opt: &Opt, color: Color, vm: &Thread) -> std::result::Result<(), Error> {
     vm.global_env().set_debug_level(opt.debug_level.clone());
     match opt.subcommand_opt {
         Some(SubOpt::Fmt(ref fmt_opt)) => {
@@ -248,8 +265,7 @@ async fn run(opt: &Opt, color: Color, vm: &Thread) -> std::result::Result<(), gl
             let input = &doc_opt.input;
             let output = &doc_opt.output;
             let thread = new_vm_async().await;
-            gluon_doc::generate_for_path(&thread, input, output)
-                .map_err(|err| format!("{}\n{}", err, err.backtrace()))?;
+            gluon_doc::generate_for_path(&thread, input, output)?;
         }
         None => {
             if opt.interactive {
@@ -283,15 +299,18 @@ async fn main() {
     let result = run(&opt, opt.color, &vm).await;
     if let Err(err) = result {
         match err {
-            Error::VM(VMError::Message(_)) => eprintln!("{}\n{}", err, vm.context().stacktrace(0)),
-            _ => {
+            Error::Gluon(gluon::Error::VM(VMError::Message(_))) => eprintln!("{}\n{}", err, vm.context().stacktrace(0)),
+            Error::Gluon(err) => {
                 let mut stderr = termcolor::StandardStream::stderr(color.into());
                 if let Err(err) = err.emit(&mut stderr) {
                     eprintln!("{}", err);
                 } else {
                     eprintln!("");
                 }
             }
+            Error::Failure(err) => {
+                eprintln!("{}", err);
+            }
         }
         ::std::process::exit(1);
     }

repl/src/main.rs

@@ -4,8 +4,8 @@ VERSION=$(echo $1 | sed 's/v//')
 shift
 
 declare -a PROJECTS=(
-    gluon_base
     gluon_codegen
+    gluon_base
     gluon_parser
     gluon_check
     gluon_completion
@@ -20,20 +20,10 @@ declare -a PROJECTS=(
 for PROJECT in "${PROJECTS[@]}"
 do
     PROJECT_PATH=$(echo "$PROJECT" | sed 's/gluon_//' | sed 's/gluon/./')
-    echo $PROJECT_PATH
 
-    if cd "${PROJECT_PATH}" && cargo publish "$@"; then
+    if ! (cd "${PROJECT_PATH}" && cargo publish "$@"); then
         exit 1
     fi
     echo "Waiting for ${PROJECT} to publish"
-    N=0
-    while ! cargo search "${PROJECT}" | head -1 | grep "${VERSION}"; do
-        printf '.'
-        sleep 3
-        N=$((N+1))
-        if [[ $N -gt 10 ]]; then
-            echo "${PROJECT} did not get published!"
-            exit 1
-        fi
-    done
+    sleep 15
 done