Browse Source

web: Updating Cargo deps + fixes for stable

Yorhel 10 months ago
parent
commit
8487d37aad
3 changed files with 44 additions and 65 deletions
  1. 37
    60
      web/Cargo.lock
  2. 2
    2
      web/Cargo.toml
  3. 5
    3
      web/src/lib.rs

+ 37
- 60
web/Cargo.lock View File

@@ -1,85 +1,67 @@
1
-[root]
2
-name = "web"
3
-version = "0.1.0"
4
-dependencies = [
5
- "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
6
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
7
-]
8
-
9 1
 [[package]]
10 2
 name = "aho-corasick"
11
-version = "0.6.1"
3
+version = "0.6.4"
12 4
 source = "registry+https://github.com/rust-lang/crates.io-index"
13 5
 dependencies = [
14
- "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
15
-]
16
-
17
-[[package]]
18
-name = "kernel32-sys"
19
-version = "0.2.2"
20
-source = "registry+https://github.com/rust-lang/crates.io-index"
21
-dependencies = [
22
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
23
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
6
+ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
24 7
 ]
25 8
 
26 9
 [[package]]
27 10
 name = "lazy_static"
28
-version = "0.2.2"
11
+version = "1.0.0"
29 12
 source = "registry+https://github.com/rust-lang/crates.io-index"
30 13
 
31 14
 [[package]]
32 15
 name = "libc"
33
-version = "0.2.19"
16
+version = "0.2.39"
34 17
 source = "registry+https://github.com/rust-lang/crates.io-index"
35 18
 
36 19
 [[package]]
37 20
 name = "memchr"
38
-version = "1.0.1"
21
+version = "2.0.1"
39 22
 source = "registry+https://github.com/rust-lang/crates.io-index"
40 23
 dependencies = [
41
- "libc 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
24
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
42 25
 ]
43 26
 
44 27
 [[package]]
45 28
 name = "regex"
46
-version = "0.2.1"
29
+version = "0.2.10"
47 30
 source = "registry+https://github.com/rust-lang/crates.io-index"
48 31
 dependencies = [
49
- "aho-corasick 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
50
- "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
51
- "regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
52
- "thread_local 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
32
+ "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
33
+ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
34
+ "regex-syntax 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
35
+ "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
53 36
  "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
54 37
 ]
55 38
 
56 39
 [[package]]
57 40
 name = "regex-syntax"
58
-version = "0.4.0"
59
-source = "registry+https://github.com/rust-lang/crates.io-index"
60
-
61
-[[package]]
62
-name = "thread-id"
63
-version = "3.0.0"
41
+version = "0.5.3"
64 42
 source = "registry+https://github.com/rust-lang/crates.io-index"
65 43
 dependencies = [
66
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
67
- "libc 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
44
+ "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
68 45
 ]
69 46
 
70 47
 [[package]]
71 48
 name = "thread_local"
72
-version = "0.3.2"
49
+version = "0.3.5"
73 50
 source = "registry+https://github.com/rust-lang/crates.io-index"
74 51
 dependencies = [
75
- "thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
76
- "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
52
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
53
+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
77 54
 ]
78 55
 
79 56
 [[package]]
80
-name = "unreachable"
57
+name = "ucd-util"
81 58
 version = "0.1.1"
82 59
 source = "registry+https://github.com/rust-lang/crates.io-index"
60
+
61
+[[package]]
62
+name = "unreachable"
63
+version = "1.0.0"
64
+source = "registry+https://github.com/rust-lang/crates.io-index"
83 65
 dependencies = [
84 66
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
85 67
 ]
@@ -95,27 +77,22 @@ version = "1.0.2"
95 77
 source = "registry+https://github.com/rust-lang/crates.io-index"
96 78
 
97 79
 [[package]]
98
-name = "winapi"
99
-version = "0.2.8"
100
-source = "registry+https://github.com/rust-lang/crates.io-index"
101
-
102
-[[package]]
103
-name = "winapi-build"
104
-version = "0.1.1"
105
-source = "registry+https://github.com/rust-lang/crates.io-index"
80
+name = "web"
81
+version = "0.1.0"
82
+dependencies = [
83
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
84
+ "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
85
+]
106 86
 
107 87
 [metadata]
108
-"checksum aho-corasick 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4f660b942762979b56c9f07b4b36bb559776fbad102f05d6771e1b629e8fd5bf"
109
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
110
-"checksum lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6abe0ee2e758cd6bc8a2cd56726359007748fbf4128da998b65d0b70f881e19b"
111
-"checksum libc 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "9e030dc72013ed68994d1b2cbf36a94dd0e58418ba949c4b0db7eeb70a7a6352"
112
-"checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
113
-"checksum regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4278c17d0f6d62dfef0ab00028feb45bd7d2102843f80763474eeb1be8a10c01"
114
-"checksum regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457"
115
-"checksum thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4437c97558c70d129e40629a5b385b3fb1ffac301e63941335e4d354081ec14a"
116
-"checksum thread_local 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7793b722f0f77ce716e7f1acf416359ca32ff24d04ffbac4269f44a4a83be05d"
117
-"checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91"
88
+"checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
89
+"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
90
+"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff"
91
+"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
92
+"checksum regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "aec3f58d903a7d2a9dc2bf0e41a746f4530e0cab6b615494e058f67a3ef947fb"
93
+"checksum regex-syntax 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b2550876c31dc914696a6c2e01cbce8afba79a93c8ae979d2fe051c0230b3756"
94
+"checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
95
+"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
96
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
118 97
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
119 98
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
120
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
121
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"

+ 2
- 2
web/Cargo.toml View File

@@ -8,8 +8,8 @@ name = "web"
8 8
 crate-type = ["lib", "staticlib"]
9 9
 
10 10
 [dependencies]
11
-regex = "0.2.1"
12
-lazy_static = "0.2.2"
11
+regex = "0.2.10"
12
+lazy_static = "1.0.0"
13 13
 
14 14
 # Add debugging symbols even in release mode, in order to help with profiling.
15 15
 [profile.release]

+ 5
- 3
web/src/lib.rs View File

@@ -1,5 +1,6 @@
1
-#![feature(test)]
2
-extern crate test;
1
+//It's really unfortunate that benchmarking is still unstable.
2
+//#![feature(test)]
3
+//extern crate test;
3 4
 extern crate regex;
4 5
 #[macro_use] extern crate lazy_static;
5 6
 
@@ -351,6 +352,7 @@ pub extern fn grotty2html_free(buf: StringWrap) {
351 352
 }
352 353
 
353 354
 
355
+/*
354 356
 #[cfg(test)]
355 357
 mod tests {
356 358
     use super::*;
@@ -388,4 +390,4 @@ mod tests {
388 390
         bench_file(b, "t/wfilter.4.output");
389 391
     }
390 392
     */
391
-}
393
+}*/

Loading…
Cancel
Save