Merge branch 'stable'

Fixes #2.
This commit is contained in:
kennytm 2015-07-05 03:45:17 +08:00
commit 19f89f7281
7 changed files with 20 additions and 11 deletions

View file

@ -1,10 +1,11 @@
env:
global:
- secure: XR0z4IBBGJP6jB0CalptPbGOhAd4HvZb5l35/SPec5sAF+9Z4tQHa7nkg9TkJd6Yf6AVyfDKCA/knVrTzrf883UfWUXMLtr1/Y5kSqEJ+bSGapRAjECHS0+Ts56N6Rqrs8mhXDtl21PtUQnvQDTedm/85VXbHqnX9kgCqVQMtCs=
language: rust
sudo: false
matrix:
include:
- rust: stable
- rust: beta
- rust: nightly
after_script:
after_success:
- cargo doc
- mv target/doc doc
- curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh
- curl https://raw.githubusercontent.com/kmcallister/travis-doc-upload/master/travis-doc-upload.sh | sh

View file

@ -12,5 +12,8 @@ documentation = "http://www.rust-ci.org/kennytm/qrcode-rust/doc/qrcode/index.htm
[dependencies]
num = "*"
[features]
bench = []
[[bin]]
name = "qrencode"

BIN
scripts/id_rsa.enc Normal file

Binary file not shown.

View file

@ -0,0 +1,3 @@
PROJECT_NAME=qrcode-rust
DOCS_REPO=kennytm/qrcode-rust.git
SSH_KEY_TRAVIS_ID=cbc3a9ac2cf3

View file

@ -2,7 +2,7 @@
use std::cmp::min;
#[cfg(test)]
#[cfg(feature="bench")]
use test::Bencher;
use types::{QrResult, QrError, Mode, EcLevel, Version};
@ -122,6 +122,7 @@ fn test_push_number() {
0b1__0000000]); // 128
}
#[cfg(feature="bench")]
#[bench]
fn bench_push_splitted_bytes(bencher: &mut Bencher) {
bencher.iter(|| {

View file

@ -18,9 +18,9 @@
//! }
//!
#![cfg_attr(test, feature(test))] // Unstable libraries
#![cfg_attr(feature="bench", feature(test))] // Unstable libraries
#[cfg(test)]
#[cfg(feature="bench")]
extern crate test;
extern crate num;

View file

@ -2,7 +2,7 @@
use std::slice::Iter;
use types::{Mode, Version};
#[cfg(test)]
#[cfg(feature="bench")]
use test::Bencher;
//------------------------------------------------------------------------------
@ -451,6 +451,7 @@ mod optimize_tests {
}
#[cfg(feature="bench")]
#[bench]
fn bench_optimize(bencher: &mut Bencher) {
use types::Version;