From 1d5d6f28832ea030e0926406cac16f9bf846a951 Mon Sep 17 00:00:00 2001 From: kennytm Date: Fri, 13 Jan 2017 11:27:57 +0800 Subject: [PATCH] Some dependencies needed the `?` operator -.-. Removed documentation, rely on docs.rs instead. --- .travis.yml | 6 +----- Cargo.toml | 4 ++-- README.md | 2 +- update_doc.sh | 26 -------------------------- 4 files changed, 4 insertions(+), 34 deletions(-) delete mode 100755 update_doc.sh diff --git a/.travis.yml b/.travis.yml index a1dea2b..57e2ab9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,7 @@ os: - osx rust: - - 1.8.0 - - 1.9.0 + - 1.13.0 - 1.14.0 - nightly @@ -29,9 +28,6 @@ env: matrix: allow_failures: - - env: ARCH=i686 - rust: 1.8.0 - # Note: on 1.8.0, all i686 build panics with the message "Box", cause all `should_panic` tests to fail. - env: ARCH=i686 rust: nightly # Note: nightly-i686 keeps failing, it seems that travis's nightly is outdated. diff --git a/Cargo.toml b/Cargo.toml index 8c09f5e..71f919f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,9 +7,9 @@ authors = ["kennytm "] keywords = ["qrcode"] repository = "https://github.com/kennytm/qrcode-rust" readme = "README.md" -documentation = "http://kennytm.github.io/qrcode-rust/" +documentation = "http://docs.rs/qrcode" exclude = [ - ".travis.yml", ".gitignore", "update_doc.sh", "test-data" + ".travis.yml", ".gitignore", "test-data" ] [dependencies] diff --git a/README.md b/README.md index 3aa64bd..9204909 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ qrcode-rust [![crates.io](http://meritbadge.herokuapp.com/qrcode)](https://crates.io/crates/qrcode) [![MIT / Apache 2.0](https://img.shields.io/badge/license-MIT%20%2f%20Apache%202.0-blue.svg)](./LICENSE-APACHE.txt) -QR code and Micro QR code encoder in Rust. [Documentation](https://kennytm.github.io/qrcode-rust). +QR code and Micro QR code encoder in Rust. [Documentation](https://docs.rs/qrcode). Cargo.toml ---------- diff --git a/update_doc.sh b/update_doc.sh deleted file mode 100755 index 29b093d..0000000 --- a/update_doc.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Generate documentation and commit into the gh-pages branch. - -set -euo pipefail - -VERSION=$(grep -w version -m 1 Cargo.toml) -COMMIT=$(git rev-parse HEAD) - -rustup default nightly -cargo doc -git worktree add doc gh-pages -cd doc -git rm -r . -git reset HEAD .gitignore index.html -git checkout -- .gitignore index.html -mv ../target/doc/qrcode . -mv ../target/doc/*.{txt,woff,js,css} . -mkdir src -mv ../target/doc/src/qrcode src -git add . -git commit -m "Update doc for ${VERSION} (${COMMIT})" -cd .. -rm -rf doc -git worktree prune -