Merge branch 'master' into auth

.travis.yml

@@ -27,7 +27,7 @@ matrix:
       script:
         - ci/script-rust.sh
     - language: rust
-      rust: 1.27.0
+      rust: 1.30.0
       env: FFMPEG_VERSION=3.4.4
       install:
         - ci/install-ffmpeg.sh

Cargo.toml

@@ -30,14 +30,14 @@ hyper = "0.12.9"
 lazy_static = "1.0"
 libc = "0.2"
 log = { version = "0.4", features = ["release_max_level_info"] }
-memmap = "0.6"
+memmap = "0.7"
 moonfire-base = { path = "base" }
 moonfire-db = { path = "db" }
 moonfire-ffmpeg = { path = "ffmpeg" }
 mylog = { git = "https://github.com/scottlamb/mylog" }
 openssl = "0.10"
 parking_lot = { version = "0.6", features = [] }
-reffers = { git = "https://github.com/diwic/reffers-rs" }
+reffers = "0.5.1"
 regex = "1.0"
 rusqlite = "0.14"
 serde = "1.0"
@@ -51,7 +51,7 @@ url = "1.4"
 uuid = { version = "0.6", features = ["serde", "std", "v4"] }
 
 [dev-dependencies]
-reqwest = "0.8"
+reqwest = "0.9.5"
 tempdir = "0.3"
 
 [dependencies.cursive]

guide/install-manual.md

@@ -45,7 +45,7 @@ all non-Rust dependencies:
                    pkgconf \
                    tzdata
 
-Next, you need Rust 1.27+ and Cargo. The easiest way to install them is by
+Next, you need Rust 1.30+ and Cargo. The easiest way to install them is by
 following the instructions at [rustup.rs](https://www.rustup.rs/).
 
 Finally, building the UI requires [yarn](https://yarnpkg.com/en/).

scripts/script-functions.sh

@@ -40,7 +40,7 @@ fi
 NODE_MIN_VERSION="8"
 YARN_MIN_VERSION="1.0"
 CARGO_MIN_VERSION="0.2"
-RUSTC_MIN_VERSION="1.27"
+RUSTC_MIN_VERSION="1.30"
 FFMPEG_MIN_VERSION="55.1.101"
 FFMPEG_RELEASE_VERSION="3.4"
 

src/mp4.rs

@@ -1456,7 +1456,7 @@ impl FileInner {
         let start = s.s.sample_file_range().start + r.start;
         let mmap = Box::new(unsafe {
             memmap::MmapOptions::new()
-                .offset(start as usize)
+                .offset(start)
                 .len((r.end - r.start) as usize)
                 .map(&f)?
             });
@@ -2204,6 +2204,7 @@ mod bench {
     use db::testutil::{self, TestDb};
     use futures::{Future, future};
     use hyper;
+    use http::header;
     use http_serve;
     use self::test::Bencher;
     use std::error::Error as StdError;
@@ -2298,10 +2299,9 @@ mod bench {
         b.bytes = p;
         let client = reqwest::Client::new();
         let mut run = || {
-            use self::reqwest::header::{Range, ByteRangeSpec};
             let mut resp =
                 client.get(server.url.clone())
-                      .header(Range::Bytes(vec![ByteRangeSpec::FromTo(0, p - 1)]))
+                      .header(header::RANGE, format!("bytes=0-{}", p - 1))
                       .send()
                       .unwrap();
             buf.clear();

src/web.rs

@@ -621,7 +621,7 @@ mod bench {
         let client = reqwest::Client::new();
         let mut f = || {
             let mut resp = client.get(url.clone()).send().unwrap();
-            assert_eq!(resp.status(), reqwest::StatusCode::Ok);
+            assert_eq!(resp.status(), reqwest::StatusCode::OK);
             buf.clear();
             use std::io::Read;
             resp.read_to_end(&mut buf).unwrap();