Merge branch 'v0.9.x'

.travis.yml

@@ -3,7 +3,7 @@ rust:
 - stable
 - beta
 - nightly
-- 1.31.0
+- 1.32.0
 matrix:
   allow_failures:
   - rust: nightly
@@ -19,13 +19,11 @@ addons:
     - gcc
     - binutils-dev
     - libiberty-dev
-    - npm
 before_script:
 - smtp-sink 2525 1000&
 - sudo chgrp -R postdrop /var/spool/postfix/maildrop
-- sudo npm set strict-ssl false && sudo npm install -g gitbook-cli
 script:
 - cargo test --verbose --all --all-features
 after_success:
 - ./.build-scripts/codecov.sh
-- '[ "$TRAVIS_BRANCH" = "v0.9.x" ] && [ $TRAVIS_PULL_REQUEST = false ] && ./.build-scripts/site-upload.sh'
+- '[ "$TRAVIS_RUST_VERSION" = "stable" ] && [ "$TRAVIS_BRANCH" = "v0.9.x" ] && [ $TRAVIS_PULL_REQUEST = false ] && ./.build-scripts/site-upload.sh'

README.md

@@ -34,7 +34,7 @@ Lettre provides the following features:
 
 ## Example
 
-This library requires Rust 1.31 or newer.
+This library requires Rust 1.32 or newer.
 To use this library, add the following to your `Cargo.toml`:
 
 ```toml

lettre/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "lettre"
-version = "0.10.0-pre" # remember to update html_root_url
+version = "0.9.1" # remember to update html_root_url
 description = "Email client"
 readme = "README.md"
 homepage = "http://lettre.at"

lettre/src/lib.rs

@@ -3,7 +3,7 @@
 //! This mailer contains the available transports for your emails.
 //!
 
-#![doc(html_root_url = "https://docs.rs/lettre/0.10.0-pre")]
+#![doc(html_root_url = "https://docs.rs/lettre/0.9.1")]
 #![deny(
     missing_copy_implementations,
     trivial_casts,

lettre_email/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "lettre_email"
-version = "0.10.0-pre" # remember to update html_root_url
+version = "0.9.1" # remember to update html_root_url
 description = "Email builder"
 readme = "README.md"
 homepage = "http://lettre.at"

lettre_email/src/lib.rs

@@ -13,6 +13,18 @@
     unused_import_braces
 )]
 
+<<<<<<< HEAD
+=======
+extern crate failure;
+#[macro_use]
+extern crate failure_derive;
+
+extern crate base64;
+extern crate email as email_format;
+extern crate lettre;
+extern crate time;
+extern crate uuid;
+>>>>>>> v0.9.x
 pub extern crate mime;
 
 pub mod error;

website/.gitignore

@@ -1,2 +1 @@
-node_modules
 /_book

website/Makefile

@@ -1,13 +1,16 @@
 all: depends _book
 
 depends:
-	gitbook install
+	cargo install --force mdbook --vers "^0.2"
+	cargo install --force mdbook-linkcheck --vers "^0.2"
 
 serve:
-	gitbook serve
+	mdbook serve
 
 _book:
-	gitbook build
+	mdbook build
 
 clean:
 	rm -rf _book/
+
+.PHONY: _book

website/book.json

@@ -1,10 +0,0 @@
-{
-    "root": "./content",
-    "plugins": [ "-sharing", "edit-link" ],
-    "pluginsConfig": {
-        "edit-link": {
-            "base": "https://github.com/lettre/lettre/edit/master/website/content",
-            "label": "Edit"
-        }
-    }
-}

website/book.toml

@@ -0,0 +1,11 @@
+[book]
+title = "Lettre"
+author = "Alexis Mousset"
+description = "The user documentation of the Lettre crate."
+
+[build]
+build-dir = "_book"
+
+[output.html]
+
+[output.linkcheck]

website/src/README.md

@@ -10,7 +10,7 @@ Lettre is an email library that allows creating and sending messages. It provide
 The `lettre_email` crate allows you to compose messages, and the `lettre`
 provide transports to send them.
 
-Lettre requires Rust 1.31 or newer. Add the following to your `Cargo.toml`:
+Lettre requires Rust 1.32 or newer. Add the following to your `Cargo.toml`:
 
 ```toml
 [dependencies]