|
33 | 33 | #[crate_type = "dylib"];
|
34 | 34 | #[license = "MIT/ASL2"];
|
35 | 35 |
|
36 |
| -#[allow(deprecated_owned_vector)]; |
37 |
| - |
38 | 36 | use std::char;
|
39 | 37 | use std::cmp;
|
40 | 38 | use std::fmt;
|
41 | 39 | use std::fmt::Show;
|
42 | 40 | use std::option::{Option, Some, None};
|
| 41 | +use std::vec_ng::Vec; |
43 | 42 |
|
44 | 43 | /// An identifier in the pre-release or build metadata. If the identifier can
|
45 | 44 | /// be parsed as a decimal value, it will be represented with `Numeric`.
|
@@ -85,9 +84,9 @@ pub struct Version {
|
85 | 84 | /// fixes are made.
|
86 | 85 | patch: uint,
|
87 | 86 | /// The pre-release version identifier, if one exists.
|
88 |
| - pre: ~[Identifier], |
| 87 | + pre: Vec<Identifier>, |
89 | 88 | /// The build metadata, ignored when determining version precedence.
|
90 |
| - build: ~[Identifier], |
| 89 | + build: Vec<Identifier>, |
91 | 90 | }
|
92 | 91 |
|
93 | 92 | impl fmt::Show for Version {
|
@@ -218,8 +217,8 @@ fn parse_iter<T: Iterator<char>>(rdr: &mut T) -> Option<Version> {
|
218 | 217 | None => return None
|
219 | 218 | };
|
220 | 219 |
|
221 |
| - let mut pre = ~[]; |
222 |
| - let mut build = ~[]; |
| 220 | + let mut pre = vec!(); |
| 221 | + let mut build = vec!(); |
223 | 222 |
|
224 | 223 | let mut ch = ch;
|
225 | 224 | if ch == Some('-') {
|
@@ -292,66 +291,66 @@ fn test_parse() {
|
292 | 291 | major: 1u,
|
293 | 292 | minor: 2u,
|
294 | 293 | patch: 3u,
|
295 |
| - pre: ~[], |
296 |
| - build: ~[], |
| 294 | + pre: vec!(), |
| 295 | + build: vec!(), |
297 | 296 | }));
|
298 | 297 | assert!(parse(" 1.2.3 ") == Some(Version {
|
299 | 298 | major: 1u,
|
300 | 299 | minor: 2u,
|
301 | 300 | patch: 3u,
|
302 |
| - pre: ~[], |
303 |
| - build: ~[], |
| 301 | + pre: vec!(), |
| 302 | + build: vec!(), |
304 | 303 | }));
|
305 | 304 | assert!(parse("1.2.3-alpha1") == Some(Version {
|
306 | 305 | major: 1u,
|
307 | 306 | minor: 2u,
|
308 | 307 | patch: 3u,
|
309 |
| - pre: ~[AlphaNumeric(~"alpha1")], |
310 |
| - build: ~[] |
| 308 | + pre: vec!(AlphaNumeric(~"alpha1")), |
| 309 | + build: vec!(), |
311 | 310 | }));
|
312 | 311 | assert!(parse(" 1.2.3-alpha1 ") == Some(Version {
|
313 | 312 | major: 1u,
|
314 | 313 | minor: 2u,
|
315 | 314 | patch: 3u,
|
316 |
| - pre: ~[AlphaNumeric(~"alpha1")], |
317 |
| - build: ~[] |
| 315 | + pre: vec!(AlphaNumeric(~"alpha1")), |
| 316 | + build: vec!() |
318 | 317 | }));
|
319 | 318 | assert!(parse("1.2.3+build5") == Some(Version {
|
320 | 319 | major: 1u,
|
321 | 320 | minor: 2u,
|
322 | 321 | patch: 3u,
|
323 |
| - pre: ~[], |
324 |
| - build: ~[AlphaNumeric(~"build5")] |
| 322 | + pre: vec!(), |
| 323 | + build: vec!(AlphaNumeric(~"build5")) |
325 | 324 | }));
|
326 | 325 | assert!(parse(" 1.2.3+build5 ") == Some(Version {
|
327 | 326 | major: 1u,
|
328 | 327 | minor: 2u,
|
329 | 328 | patch: 3u,
|
330 |
| - pre: ~[], |
331 |
| - build: ~[AlphaNumeric(~"build5")] |
| 329 | + pre: vec!(), |
| 330 | + build: vec!(AlphaNumeric(~"build5")) |
332 | 331 | }));
|
333 | 332 | assert!(parse("1.2.3-alpha1+build5") == Some(Version {
|
334 | 333 | major: 1u,
|
335 | 334 | minor: 2u,
|
336 | 335 | patch: 3u,
|
337 |
| - pre: ~[AlphaNumeric(~"alpha1")], |
338 |
| - build: ~[AlphaNumeric(~"build5")] |
| 336 | + pre: vec!(AlphaNumeric(~"alpha1")), |
| 337 | + build: vec!(AlphaNumeric(~"build5")) |
339 | 338 | }));
|
340 | 339 | assert!(parse(" 1.2.3-alpha1+build5 ") == Some(Version {
|
341 | 340 | major: 1u,
|
342 | 341 | minor: 2u,
|
343 | 342 | patch: 3u,
|
344 |
| - pre: ~[AlphaNumeric(~"alpha1")], |
345 |
| - build: ~[AlphaNumeric(~"build5")] |
| 343 | + pre: vec!(AlphaNumeric(~"alpha1")), |
| 344 | + build: vec!(AlphaNumeric(~"build5")) |
346 | 345 | }));
|
347 | 346 | assert!(parse("1.2.3-1.alpha1.9+build5.7.3aedf ") == Some(Version {
|
348 | 347 | major: 1u,
|
349 | 348 | minor: 2u,
|
350 | 349 | patch: 3u,
|
351 |
| - pre: ~[Numeric(1),AlphaNumeric(~"alpha1"),Numeric(9)], |
352 |
| - build: ~[AlphaNumeric(~"build5"), |
| 350 | + pre: vec!(Numeric(1),AlphaNumeric(~"alpha1"),Numeric(9)), |
| 351 | + build: vec!(AlphaNumeric(~"build5"), |
353 | 352 | Numeric(7),
|
354 |
| - AlphaNumeric(~"3aedf")] |
| 353 | + AlphaNumeric(~"3aedf")) |
355 | 354 | }));
|
356 | 355 |
|
357 | 356 | }
|
|
0 commit comments