Skip to content

Commit dae46b4

Browse files
committed
---
yaml --- r: 149995 b: refs/heads/try2 c: a37ca8c h: refs/heads/master i: 149993: d4d3935 149991: d650f95 v: v3
1 parent aa56692 commit dae46b4

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: b1f523525a8ae906d82ef0dccf716aa3b0cd6670
8+
refs/heads/try2: a37ca8ce385ce06d8175e56486efe544b67488e3
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsemver/lib.rs

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,12 @@
3333
#[crate_type = "dylib"];
3434
#[license = "MIT/ASL2"];
3535

36-
#[allow(deprecated_owned_vector)];
37-
3836
use std::char;
3937
use std::cmp;
4038
use std::fmt;
4139
use std::fmt::Show;
4240
use std::option::{Option, Some, None};
41+
use std::vec_ng::Vec;
4342

4443
/// An identifier in the pre-release or build metadata. If the identifier can
4544
/// be parsed as a decimal value, it will be represented with `Numeric`.
@@ -85,9 +84,9 @@ pub struct Version {
8584
/// fixes are made.
8685
patch: uint,
8786
/// The pre-release version identifier, if one exists.
88-
pre: ~[Identifier],
87+
pre: Vec<Identifier>,
8988
/// The build metadata, ignored when determining version precedence.
90-
build: ~[Identifier],
89+
build: Vec<Identifier>,
9190
}
9291

9392
impl fmt::Show for Version {
@@ -218,8 +217,8 @@ fn parse_iter<T: Iterator<char>>(rdr: &mut T) -> Option<Version> {
218217
None => return None
219218
};
220219

221-
let mut pre = ~[];
222-
let mut build = ~[];
220+
let mut pre = vec!();
221+
let mut build = vec!();
223222

224223
let mut ch = ch;
225224
if ch == Some('-') {
@@ -292,66 +291,66 @@ fn test_parse() {
292291
major: 1u,
293292
minor: 2u,
294293
patch: 3u,
295-
pre: ~[],
296-
build: ~[],
294+
pre: vec!(),
295+
build: vec!(),
297296
}));
298297
assert!(parse(" 1.2.3 ") == Some(Version {
299298
major: 1u,
300299
minor: 2u,
301300
patch: 3u,
302-
pre: ~[],
303-
build: ~[],
301+
pre: vec!(),
302+
build: vec!(),
304303
}));
305304
assert!(parse("1.2.3-alpha1") == Some(Version {
306305
major: 1u,
307306
minor: 2u,
308307
patch: 3u,
309-
pre: ~[AlphaNumeric(~"alpha1")],
310-
build: ~[]
308+
pre: vec!(AlphaNumeric(~"alpha1")),
309+
build: vec!(),
311310
}));
312311
assert!(parse(" 1.2.3-alpha1 ") == Some(Version {
313312
major: 1u,
314313
minor: 2u,
315314
patch: 3u,
316-
pre: ~[AlphaNumeric(~"alpha1")],
317-
build: ~[]
315+
pre: vec!(AlphaNumeric(~"alpha1")),
316+
build: vec!()
318317
}));
319318
assert!(parse("1.2.3+build5") == Some(Version {
320319
major: 1u,
321320
minor: 2u,
322321
patch: 3u,
323-
pre: ~[],
324-
build: ~[AlphaNumeric(~"build5")]
322+
pre: vec!(),
323+
build: vec!(AlphaNumeric(~"build5"))
325324
}));
326325
assert!(parse(" 1.2.3+build5 ") == Some(Version {
327326
major: 1u,
328327
minor: 2u,
329328
patch: 3u,
330-
pre: ~[],
331-
build: ~[AlphaNumeric(~"build5")]
329+
pre: vec!(),
330+
build: vec!(AlphaNumeric(~"build5"))
332331
}));
333332
assert!(parse("1.2.3-alpha1+build5") == Some(Version {
334333
major: 1u,
335334
minor: 2u,
336335
patch: 3u,
337-
pre: ~[AlphaNumeric(~"alpha1")],
338-
build: ~[AlphaNumeric(~"build5")]
336+
pre: vec!(AlphaNumeric(~"alpha1")),
337+
build: vec!(AlphaNumeric(~"build5"))
339338
}));
340339
assert!(parse(" 1.2.3-alpha1+build5 ") == Some(Version {
341340
major: 1u,
342341
minor: 2u,
343342
patch: 3u,
344-
pre: ~[AlphaNumeric(~"alpha1")],
345-
build: ~[AlphaNumeric(~"build5")]
343+
pre: vec!(AlphaNumeric(~"alpha1")),
344+
build: vec!(AlphaNumeric(~"build5"))
346345
}));
347346
assert!(parse("1.2.3-1.alpha1.9+build5.7.3aedf ") == Some(Version {
348347
major: 1u,
349348
minor: 2u,
350349
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"),
353352
Numeric(7),
354-
AlphaNumeric(~"3aedf")]
353+
AlphaNumeric(~"3aedf"))
355354
}));
356355
357356
}

0 commit comments

Comments
 (0)