浏览代码

Update dependencies, min Rust version to 1.26.2

Johannes Hofmann 7 年前
父节点
当前提交
9a6e7d71d5
共有 6 个文件被更改,包括 468 次插入411 次删除
  1. 1
    1
      .appveyor.yml
  2. 1
    1
      .travis.yml
  3. 462
    405
      Cargo.lock
  4. 2
    2
      Cargo.toml
  5. 1
    1
      README.md
  6. 1
    1
      src/texture.rs

+ 1
- 1
.appveyor.yml 查看文件

7
   - TARGET: x86_64-pc-windows-msvc
7
   - TARGET: x86_64-pc-windows-msvc
8
     CHANNEL: stable
8
     CHANNEL: stable
9
   - TARGET: x86_64-pc-windows-msvc
9
   - TARGET: x86_64-pc-windows-msvc
10
-    CHANNEL: 1.25.0
10
+    CHANNEL: 1.26.2
11
   - TARGET: x86_64-pc-windows-gnu
11
   - TARGET: x86_64-pc-windows-gnu
12
     CHANNEL: stable
12
     CHANNEL: stable
13
   - TARGET: x86_64-pc-windows-gnu
13
   - TARGET: x86_64-pc-windows-gnu

+ 1
- 1
.travis.yml 查看文件

3
   - stable
3
   - stable
4
   - beta
4
   - beta
5
   - nightly
5
   - nightly
6
-  - 1.25.0
6
+  - 1.26.2
7
 cache: cargo
7
 cache: cargo
8
 dist: trusty
8
 dist: trusty
9
 sudo: false
9
 sudo: false

+ 462
- 405
Cargo.lock
文件差异内容过多而无法显示
查看文件


+ 2
- 2
Cargo.toml 查看文件

17
 env_logger = "0.5.0-rc.2"
17
 env_logger = "0.5.0-rc.2"
18
 gl = "0.10"
18
 gl = "0.10"
19
 glutin = "0.18"
19
 glutin = "0.18"
20
-image = "0.19"
20
+image = "0.20"
21
 lazy_static = "1.0"
21
 lazy_static = "1.0"
22
 linked-hash-map = "0.5.0"
22
 linked-hash-map = "0.5.0"
23
 log = "0.4"
23
 log = "0.4"
24
 num_cpus = "1.0"
24
 num_cpus = "1.0"
25
 osmpbf = "0.1"
25
 osmpbf = "0.1"
26
 regex = "1.0"
26
 regex = "1.0"
27
-reqwest = "0.8"
27
+reqwest = "0.9"
28
 scoped_threadpool = "0.1"
28
 scoped_threadpool = "0.1"
29
 toml = "0.4"
29
 toml = "0.4"
30
 
30
 

+ 1
- 1
README.md 查看文件

6
 --------
6
 --------
7
 DeltaMap is written in Rust, so you will need to [install
7
 DeltaMap is written in Rust, so you will need to [install
8
 Rust](https://www.rust-lang.org/install.html) to compile the program. The
8
 Rust](https://www.rust-lang.org/install.html) to compile the program. The
9
-minimum supported version of Rust for DeltaMap is **1.25**.
9
+minimum supported version of Rust for DeltaMap is **1.26.2**.
10
 
10
 
11
 On Linux you will also need OpenSSL with headers.
11
 On Linux you will also need OpenSSL with headers.
12
 (see <https://docs.rs/crate/openssl/0.10.12> for details)
12
 (see <https://docs.rs/crate/openssl/0.10.12> for details)

+ 1
- 1
src/texture.rs 查看文件

1
 use ::context;
1
 use ::context;
2
 use ::image;
2
 use ::image;
3
 use context::{Context, TextureUnit};
3
 use context::{Context, TextureUnit};
4
-use image::GenericImage;
4
+use image::GenericImageView;
5
 use std::os::raw::c_void;
5
 use std::os::raw::c_void;
6
 
6
 
7
 #[derive(Clone, Debug)]
7
 #[derive(Clone, Debug)]