From a37ca8ce385ce06d8175e56486efe544b67488e3 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 15 Mar 2014 15:41:51 -0700 Subject: [PATCH] Remove ~[] from libsemver --- src/libsemver/lib.rs | 49 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/src/libsemver/lib.rs b/src/libsemver/lib.rs index 3ffafbada910..5e31e649f713 100644 --- a/src/libsemver/lib.rs +++ b/src/libsemver/lib.rs @@ -33,13 +33,12 @@ #[crate_type = "dylib"]; #[license = "MIT/ASL2"]; -#[allow(deprecated_owned_vector)]; - use std::char; use std::cmp; use std::fmt; use std::fmt::Show; use std::option::{Option, Some, None}; +use std::vec_ng::Vec; /// An identifier in the pre-release or build metadata. If the identifier can /// be parsed as a decimal value, it will be represented with `Numeric`. @@ -85,9 +84,9 @@ pub struct Version { /// fixes are made. patch: uint, /// The pre-release version identifier, if one exists. - pre: ~[Identifier], + pre: Vec, /// The build metadata, ignored when determining version precedence. - build: ~[Identifier], + build: Vec, } impl fmt::Show for Version { @@ -218,8 +217,8 @@ fn parse_iter>(rdr: &mut T) -> Option { None => return None }; - let mut pre = ~[]; - let mut build = ~[]; + let mut pre = vec!(); + let mut build = vec!(); let mut ch = ch; if ch == Some('-') { @@ -292,66 +291,66 @@ fn test_parse() { major: 1u, minor: 2u, patch: 3u, - pre: ~[], - build: ~[], + pre: vec!(), + build: vec!(), })); assert!(parse(" 1.2.3 ") == Some(Version { major: 1u, minor: 2u, patch: 3u, - pre: ~[], - build: ~[], + pre: vec!(), + build: vec!(), })); assert!(parse("1.2.3-alpha1") == Some(Version { major: 1u, minor: 2u, patch: 3u, - pre: ~[AlphaNumeric(~"alpha1")], - build: ~[] + pre: vec!(AlphaNumeric(~"alpha1")), + build: vec!(), })); assert!(parse(" 1.2.3-alpha1 ") == Some(Version { major: 1u, minor: 2u, patch: 3u, - pre: ~[AlphaNumeric(~"alpha1")], - build: ~[] + pre: vec!(AlphaNumeric(~"alpha1")), + build: vec!() })); assert!(parse("1.2.3+build5") == Some(Version { major: 1u, minor: 2u, patch: 3u, - pre: ~[], - build: ~[AlphaNumeric(~"build5")] + pre: vec!(), + build: vec!(AlphaNumeric(~"build5")) })); assert!(parse(" 1.2.3+build5 ") == Some(Version { major: 1u, minor: 2u, patch: 3u, - pre: ~[], - build: ~[AlphaNumeric(~"build5")] + pre: vec!(), + build: vec!(AlphaNumeric(~"build5")) })); assert!(parse("1.2.3-alpha1+build5") == Some(Version { major: 1u, minor: 2u, patch: 3u, - pre: ~[AlphaNumeric(~"alpha1")], - build: ~[AlphaNumeric(~"build5")] + pre: vec!(AlphaNumeric(~"alpha1")), + build: vec!(AlphaNumeric(~"build5")) })); assert!(parse(" 1.2.3-alpha1+build5 ") == Some(Version { major: 1u, minor: 2u, patch: 3u, - pre: ~[AlphaNumeric(~"alpha1")], - build: ~[AlphaNumeric(~"build5")] + pre: vec!(AlphaNumeric(~"alpha1")), + build: vec!(AlphaNumeric(~"build5")) })); assert!(parse("1.2.3-1.alpha1.9+build5.7.3aedf ") == Some(Version { major: 1u, minor: 2u, patch: 3u, - pre: ~[Numeric(1),AlphaNumeric(~"alpha1"),Numeric(9)], - build: ~[AlphaNumeric(~"build5"), + pre: vec!(Numeric(1),AlphaNumeric(~"alpha1"),Numeric(9)), + build: vec!(AlphaNumeric(~"build5"), Numeric(7), - AlphaNumeric(~"3aedf")] + AlphaNumeric(~"3aedf")) })); }