Try to make windows work + remove musl

.travis.yml

@@ -11,7 +11,6 @@ matrix:
   include:
     # Linux
     - env: TARGET=x86_64-unknown-linux-gnu
-    - env: TARGET=x86_64-unknown-linux-musl
     # OSX
     - env: TARGET=x86_64-apple-darwin
       os: osx

Cargo.toml

@@ -23,10 +23,10 @@ glob = "0.2"
 serde = "0.9"
 serde_derive = "0.9"
 # tera = { path = "../tera" }
-# tera = { git = "https://github.com/Keats/tera", branch = "reload" }
-tera = "0.8"
+# tera = { git = "https://github.com/Keats/tera" }
+tera = "0.9"
 slug = "0.1"
-syntect = "1"
+syntect = { version = "1", features = ["static-onig"] }
 chrono = "0.3"
 toml = { version = "0.3", default-features = false, features = ["serde"]}
 term-painter = "0.2"
@@ -37,7 +37,7 @@ staticfile = "0.4"
 iron = "0.5"
 mount = "0.3"
 notify = "4"
-ws = "0.6"
+ws = "0.7"
 
 [dev-dependencies]
 tempdir = "0.3"

appveyor.yml

@@ -10,23 +10,26 @@ environment:
     # TODO Update this to match the name of your project.
     CRATE_NAME: gutenberg
 
-  # TODO These are all the build jobs. Adjust as necessary. Comment out what you
-  # don't need
   matrix:
-    # MinGW
-    - TARGET: i686-pc-windows-gnu
-    - TARGET: x86_64-pc-windows-gnu
+    # GNU
+    - channel: stable
+      target: x86_64-pc-windows-gnu
+      TOOLCHAIN: msys
+      MSYS_BITS: 64
     # MSVC
-    - TARGET: i686-pc-windows-msvc
-    - TARGET: x86_64-pc-windows-msvc
+    - channel: stable
+      target: x86_64-pc-windows-msvc
+      TOOLCHAIN: msvc
+      PLATFORM: x86_64
 
 install:
   - ps: >-
       If ($Env:TARGET -eq 'x86_64-pc-windows-gnu') {
         $Env:PATH += ';C:\msys64\mingw64\bin;C:\Program Files\Git\mingw64\bin'
-      } ElseIf ($Env:TARGET -eq 'i686-pc-windows-gnu') {
-        $Env:PATH += ';C:\msys64\mingw32\bin;C:\Program Files\Git\mingw64\bin'
       }
+  - if "%TOOLCHAIN%" == "msvc" if "%PLATFORM%" == "x86_64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
+  - if "%TOOLCHAIN%" == "msvc" if "%PLATFORM%" == "x86_64" call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
+  - if "%TOOLCHAIN%" == "msys" set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
   - curl -sSf -o rustup-init.exe https://win.rustup.rs/
   - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_VERSION%
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
@@ -40,9 +43,7 @@ test_script:
       cargo build --target %TARGET% &&
       cargo build --target %TARGET% --release &&
       cargo test --target %TARGET% &&
-      cargo test --target %TARGET% --release &&
-      cargo run --target %TARGET% &&
-      cargo run --target %TARGET% --release
+      cargo test --target %TARGET% --release
     )
 
 before_deploy:
@@ -78,9 +79,5 @@ branches:
     - /^v\d+\.\d+\.\d+.*$/
     - master
 
-notifications:
-  - provider: Email
-    on_build_success: false
-
 # disable automatic builds
 build: false

ci/before_deploy.ps1

@@ -11,7 +11,7 @@ Set-Location $STAGE
 $ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip"
 
 # TODO Update this to package the right artifacts
-Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\hello.exe" '.\'
+Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\gutenberg.exe" '.\'
 
 7z a "$ZIP" *
 

src/front_matter.rs

@@ -11,7 +11,7 @@ use errors::{Result, ResultExt};
 
 
 lazy_static! {
-    static ref PAGE_RE: Regex = Regex::new(r"^\n?\+\+\+\n((?s).*?(?-s))\+\+\+\n?((?s).*(?-s))$").unwrap();
+    static ref PAGE_RE: Regex = Regex::new(r"^\r?\n?\+\+\+\r?\n((?s).*?(?-s))\+\+\+\r?\n?((?s).*(?-s))$").unwrap();
 }