Skip to content

Commit af0d5b0

Browse files
bblumbblum
committed
---
yaml --- r: 143663 b: refs/heads/try2 c: 47e82c8 h: refs/heads/master i: 143661: b561f23 143659: 8ab9420 143655: 243e827 143647: 2dd3395 v: v3
1 parent 0168515 commit af0d5b0

File tree

136 files changed

+1162
-1213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1162
-1213
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: 3dfb55ab09a8533da7c5bf559c923685d5d64dc1
8+
refs/heads/try2: 47e82c85555895c21206c84b62cac19eb351d1b8
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/mk/target.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)): \
4848
| $$(TLIB$(1)_T_$(2)_H_$(3))/
4949
@$$(call E, compile_and_link: $$@)
5050
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(2)),$$(notdir $$@))
51-
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
51+
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) -o $$@ $$< && touch $$@
5252
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(2)),$$(notdir $$@))
5353

5454
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)): \
@@ -58,7 +58,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)): \
5858
| $$(TLIB$(1)_T_$(2)_H_$(3))/
5959
@$$(call E, compile_and_link: $$@)
6060
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(2)),$$(notdir $$@))
61-
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
61+
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) -o $$@ $$< && touch $$@
6262
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(2)),$$(notdir $$@))
6363

6464
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
@@ -69,7 +69,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
6969
| $$(TLIB$(1)_T_$(2)_H_$(3))/
7070
@$$(call E, compile_and_link: $$@)
7171
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(2)),$$(notdir $$@))
72-
$$(STAGE$(1)_T_$(2)_H_$(3)) $(BORROWCK) --out-dir $$(@D) $$< && touch $$@
72+
$$(STAGE$(1)_T_$(2)_H_$(3)) $(BORROWCK) -o $$@ $$< && touch $$@
7373
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(2)),$$(notdir $$@))
7474

7575
# Only build the compiler for host triples
@@ -90,7 +90,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
9090
| $$(TLIB$(1)_T_$(2)_H_$(3))/
9191
@$$(call E, compile_and_link: $$@)
9292
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@))
93-
$$(STAGE$(1)_T_$(2)_H_$(3)) --out-dir $$(@D) $$< && touch $$@
93+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
9494
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@))
9595

9696
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \

‎branches/try2/mk/tools.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)): \
4949
| $$(TLIB$(1)_T_$(4)_H_$(3))/
5050
@$$(call E, compile_and_link: $$@)
5151
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTPKG_GLOB_$(4)),$$(notdir $$@))
52-
$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
52+
$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) -o $$@ $$< && touch $$@
5353
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTPKG_GLOB_$(4)),$$(notdir $$@))
5454

5555
$$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X_$(4)): \
@@ -67,7 +67,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)): \
6767
| $$(TLIB$(1)_T_$(4)_H_$(3))/
6868
@$$(call E, compile_and_link: $$@)
6969
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOC_GLOB_$(4)),$$(notdir $$@))
70-
$$(STAGE$(1)_T_$(4)_H_$(3)) --out-dir $$(@D) $$< && touch $$@
70+
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
7171
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOC_GLOB_$(4)),$$(notdir $$@))
7272

7373
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X_$(4)): \
@@ -85,7 +85,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)): \
8585
| $$(TLIB$(1)_T_$(4)_H_$(3))/
8686
@$$(call E, compile_and_link: $$@)
8787
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTI_GLOB_$(4)),$$(notdir $$@))
88-
$$(STAGE$(1)_T_$(4)_H_$(3)) --out-dir $$(@D) $$< && touch $$@
88+
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
8989
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTI_GLOB_$(4)),$$(notdir $$@))
9090

9191
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X_$(4)): \
@@ -106,7 +106,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)): \
106106
| $$(TLIB$(1)_T_$(4)_H_$(3))/
107107
@$$(call E, compile_and_link: $$@)
108108
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUST_GLOB_$(4)),$$(notdir $$@))
109-
$$(STAGE$(1)_T_$(4)_H_$(3)) --out-dir $$(@D) $$< && touch $$@
109+
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
110110
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUST_GLOB_$(4)),$$(notdir $$@))
111111

112112
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X_$(4)): \

‎branches/try2/src/compiletest/compiletest.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#[crate_type = "bin"];
1212

1313
#[allow(non_camel_case_types)];
14+
#[allow(unrecognized_lint)]; // NOTE: remove after snapshot
1415
#[deny(warnings)];
1516

1617
extern mod extra;
@@ -130,7 +131,7 @@ pub fn parse_config(args: ~[~str]) -> config {
130131
ratchet_noise_percent:
131132
getopts::opt_maybe_str(matches,
132133
"ratchet-noise-percent").map(|s|
133-
f64::from_str(*s).unwrap()),
134+
f64::from_str(*s).get()),
134135
runtool: getopts::opt_maybe_str(matches, "runtool"),
135136
rustcflags: getopts::opt_maybe_str(matches, "rustcflags"),
136137
jit: getopts::opt_present(matches, "jit"),
@@ -266,7 +267,7 @@ pub fn is_test(config: &config, testfile: &Path) -> bool {
266267
_ => ~[~".rc", ~".rs"]
267268
};
268269
let invalid_prefixes = ~[~".", ~"#", ~"~"];
269-
let name = testfile.filename().unwrap();
270+
let name = testfile.filename().get();
270271

271272
let mut valid = false;
272273

@@ -299,7 +300,7 @@ pub fn make_test_name(config: &config, testfile: &Path) -> test::TestName {
299300
fn shorten(path: &Path) -> ~str {
300301
let filename = path.filename();
301302
let dir = path.pop().filename();
302-
fmt!("%s/%s", dir.unwrap_or_default(~""), filename.unwrap_or_default(~""))
303+
fmt!("%s/%s", dir.get_or_default(~""), filename.get_or_default(~""))
303304
}
304305

305306
test::DynTestName(fmt!("[%s] %s",

‎branches/try2/src/compiletest/runtest.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ fn run_pretty_test(config: &config, props: &TestProps, testfile: &Path) {
145145
let rounds =
146146
match props.pp_exact { Some(_) => 1, None => 2 };
147147

148-
let mut srcs = ~[io::read_whole_file_str(testfile).unwrap()];
148+
let mut srcs = ~[io::read_whole_file_str(testfile).get()];
149149

150150
let mut round = 0;
151151
while round < rounds {
@@ -166,7 +166,7 @@ fn run_pretty_test(config: &config, props: &TestProps, testfile: &Path) {
166166
match props.pp_exact {
167167
Some(ref file) => {
168168
let filepath = testfile.dir_path().push_rel(file);
169-
io::read_whole_file_str(&filepath).unwrap()
169+
io::read_whole_file_str(&filepath).get()
170170
}
171171
None => { srcs[srcs.len() - 2u].clone() }
172172
};
@@ -448,7 +448,7 @@ fn scan_until_char(haystack: &str, needle: char, idx: &mut uint) -> bool {
448448
if opt.is_none() {
449449
return false;
450450
}
451-
*idx = opt.unwrap();
451+
*idx = opt.get();
452452
return true;
453453
}
454454

@@ -709,7 +709,7 @@ fn aux_output_dir_name(config: &config, testfile: &Path) -> Path {
709709
}
710710

711711
fn output_testname(testfile: &Path) -> Path {
712-
Path(testfile.filestem().unwrap())
712+
Path(testfile.filestem().get())
713713
}
714714

715715
fn output_base_name(config: &config, testfile: &Path) -> Path {
@@ -878,7 +878,7 @@ fn append_suffix_to_stem(p: &Path, suffix: &str) -> Path {
878878
if suffix.len() == 0 {
879879
(*p).clone()
880880
} else {
881-
let stem = p.filestem().unwrap();
881+
let stem = p.filestem().get();
882882
p.with_filestem(stem + "-" + suffix)
883883
}
884884
}
@@ -938,7 +938,7 @@ fn disassemble_extract(config: &config, _props: &TestProps,
938938

939939

940940
fn count_extracted_lines(p: &Path) -> uint {
941-
let x = io::read_whole_file_str(&p.with_filetype("ll")).unwrap();
941+
let x = io::read_whole_file_str(&p.with_filetype("ll")).get();
942942
x.line_iter().len_()
943943
}
944944

‎branches/try2/src/libextra/base64.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -322,24 +322,24 @@ mod test {
322322
323323
#[test]
324324
fn test_from_base64_basic() {
325-
assert_eq!("".from_base64().unwrap(), "".as_bytes().to_owned());
326-
assert_eq!("Zg==".from_base64().unwrap(), "f".as_bytes().to_owned());
327-
assert_eq!("Zm8=".from_base64().unwrap(), "fo".as_bytes().to_owned());
328-
assert_eq!("Zm9v".from_base64().unwrap(), "foo".as_bytes().to_owned());
329-
assert_eq!("Zm9vYg==".from_base64().unwrap(), "foob".as_bytes().to_owned());
330-
assert_eq!("Zm9vYmE=".from_base64().unwrap(), "fooba".as_bytes().to_owned());
331-
assert_eq!("Zm9vYmFy".from_base64().unwrap(), "foobar".as_bytes().to_owned());
325+
assert_eq!("".from_base64().get(), "".as_bytes().to_owned());
326+
assert_eq!("Zg==".from_base64().get(), "f".as_bytes().to_owned());
327+
assert_eq!("Zm8=".from_base64().get(), "fo".as_bytes().to_owned());
328+
assert_eq!("Zm9v".from_base64().get(), "foo".as_bytes().to_owned());
329+
assert_eq!("Zm9vYg==".from_base64().get(), "foob".as_bytes().to_owned());
330+
assert_eq!("Zm9vYmE=".from_base64().get(), "fooba".as_bytes().to_owned());
331+
assert_eq!("Zm9vYmFy".from_base64().get(), "foobar".as_bytes().to_owned());
332332
}
333333
334334
#[test]
335335
fn test_from_base64_newlines() {
336-
assert_eq!("Zm9v\r\nYmFy".from_base64().unwrap(),
336+
assert_eq!("Zm9v\r\nYmFy".from_base64().get(),
337337
"foobar".as_bytes().to_owned());
338338
}
339339
340340
#[test]
341341
fn test_from_base64_urlsafe() {
342-
assert_eq!("-_8".from_base64().unwrap(), "+/8=".from_base64().unwrap());
342+
assert_eq!("-_8".from_base64().get(), "+/8=".from_base64().get());
343343
}
344344
345345
#[test]
@@ -364,7 +364,7 @@ mod test {
364364
push(random());
365365
}
366366
};
367-
assert_eq!(v.to_base64(STANDARD).from_base64().unwrap(), v);
367+
assert_eq!(v.to_base64(STANDARD).from_base64().get(), v);
368368
}
369369
}
370370

‎branches/try2/src/libextra/bitv.rs

Lines changed: 48 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use std::cmp;
1515
use std::iterator::RandomAccessIterator;
16-
use std::iterator::{Invert, Enumerate, Repeat, Map, Zip};
16+
use std::iterator::{Invert, Enumerate};
1717
use std::num;
1818
use std::ops;
1919
use std::uint;
@@ -206,13 +206,14 @@ impl BigBitv {
206206
#[inline]
207207
pub fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
208208
let len = b.storage.len();
209-
for i in range(0, len) {
209+
do uint::iterate(0, len) |i| {
210210
let mask = big_mask(nbits, i);
211211
if mask & self.storage[i] != mask & b.storage[i] {
212-
return false;
212+
false
213+
} else {
214+
true
213215
}
214216
}
215-
true
216217
}
217218
}
218219

@@ -863,12 +864,13 @@ impl BitvSet {
863864
/// w1, w2) where the bit location is the number of bits offset so far,
864865
/// and w1/w2 are the words coming from the two vectors self, other.
865866
fn common_iter<'a>(&'a self, other: &'a BitvSet)
866-
-> Map<'static, ((uint, &'a uint), &'a ~[uint]), (uint, uint, uint),
867-
Zip<Enumerate<vec::VecIterator<'a, uint>>, Repeat<&'a ~[uint]>>> {
868-
let min = num::min(self.bitv.storage.len(), other.bitv.storage.len());
869-
self.bitv.storage.slice(0, min).iter().enumerate()
870-
.zip(Repeat::new(&other.bitv.storage))
871-
.transform(|((i, &w), o_store)| (i * uint::bits, w, o_store[i]))
867+
-> MapE<(uint,&uint),(uint,uint,uint), &'a ~[uint],Enumerate<vec::VecIterator<'a,uint>>> {
868+
let min = num::min(self.bitv.storage.len(),
869+
other.bitv.storage.len());
870+
MapE{iter: self.bitv.storage.slice(0, min).iter().enumerate(),
871+
env: &other.bitv.storage,
872+
f: |(i, &w): (uint, &uint), o_store| (i * uint::bits, w, o_store[i])
873+
}
872874
}
873875

874876
/// Visits each word in self or other that extends beyond the other. This
@@ -879,21 +881,45 @@ impl BitvSet {
879881
/// is true if the word comes from 'self', and false if it comes from
880882
/// 'other'.
881883
fn outlier_iter<'a>(&'a self, other: &'a BitvSet)
882-
-> Map<'static, ((uint, &'a uint), uint), (bool, uint, uint),
883-
Zip<Enumerate<vec::VecIterator<'a, uint>>, Repeat<uint>>> {
884-
let slen = self.bitv.storage.len();
885-
let olen = other.bitv.storage.len();
886-
887-
if olen < slen {
888-
self.bitv.storage.slice_from(olen).iter().enumerate()
889-
.zip(Repeat::new(olen))
890-
.transform(|((i, &w), min)| (true, (i + min) * uint::bits, w))
884+
-> MapE<(uint, &uint),(bool, uint, uint), uint, Enumerate<vec::VecIterator<'a, uint>>> {
885+
let len1 = self.bitv.storage.len();
886+
let len2 = other.bitv.storage.len();
887+
let min = num::min(len1, len2);
888+
889+
if min < len1 {
890+
MapE{iter: self.bitv.storage.slice(min, len1).iter().enumerate(),
891+
env: min,
892+
f: |(i, &w): (uint, &uint), min| (true, (i + min) * uint::bits, w)
893+
}
891894
} else {
892-
other.bitv.storage.slice_from(slen).iter().enumerate()
893-
.zip(Repeat::new(slen))
894-
.transform(|((i, &w), min)| (false, (i + min) * uint::bits, w))
895+
MapE{iter: other.bitv.storage.slice(min, len2).iter().enumerate(),
896+
env: min,
897+
f: |(i, &w): (uint, &uint), min| (false, (i + min) * uint::bits, w)
898+
}
899+
}
900+
}
901+
}
902+
903+
/// Like iterator::Map with explicit env capture
904+
struct MapE<A, B, Env, I> {
905+
priv env: Env,
906+
priv f: &'static fn(A, Env) -> B,
907+
priv iter: I,
908+
}
909+
910+
impl<'self, A, B, Env: Clone, I: Iterator<A>> Iterator<B> for MapE<A, B, Env, I> {
911+
#[inline]
912+
fn next(&mut self) -> Option<B> {
913+
match self.iter.next() {
914+
Some(elt) => Some((self.f)(elt, self.env.clone())),
915+
None => None
895916
}
896917
}
918+
919+
#[inline]
920+
fn size_hint(&self) -> (uint, Option<uint>) {
921+
self.iter.size_hint()
922+
}
897923
}
898924

899925
pub struct BitvSetIterator<'self> {

‎branches/try2/src/libextra/extra.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ pub mod par;
9191
pub mod base64;
9292
pub mod rl;
9393
pub mod workcache;
94-
pub mod enum_set;
9594
#[path="num/bigint.rs"]
9695
pub mod bigint;
9796
#[path="num/rational.rs"]

‎branches/try2/src/libextra/fileinput.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@ mod test {
526526

527527
do input_vec_state(filenames) |line, state| {
528528
let nums: ~[&str] = line.split_iter(' ').collect();
529-
let file_num = uint::from_str(nums[0]).unwrap();
530-
let line_num = uint::from_str(nums[1]).unwrap();
529+
let file_num = uint::from_str(nums[0]).get();
530+
let line_num = uint::from_str(nums[1]).get();
531531
assert_eq!(line_num, state.line_num_file);
532532
assert_eq!(file_num * 3 + line_num, state.line_num);
533533
true

‎branches/try2/src/libextra/getopts.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ fn find_opt(opts: &[Opt], nm: Name) -> Option<uint> {
196196
* The type returned when the command line does not conform to the
197197
* expected format. Pass this value to <fail_str> to get an error message.
198198
*/
199-
#[deriving(Clone, Eq, ToStr)]
199+
#[deriving(Clone, Eq)]
200200
pub enum Fail_ {
201201
ArgumentMissing(~str),
202202
UnrecognizedOption(~str),
@@ -288,7 +288,7 @@ pub fn getopts(args: &[~str], opts: &[Opt]) -> Result {
288288
None => {
289289
let arg_follows =
290290
last_valid_opt_id.is_some() &&
291-
match opts[last_valid_opt_id.unwrap()]
291+
match opts[last_valid_opt_id.get()]
292292
.hasarg {
293293
294294
Yes | Maybe => true,
@@ -322,15 +322,15 @@ pub fn getopts(args: &[~str], opts: &[Opt]) -> Result {
322322
}
323323
Maybe => {
324324
if !i_arg.is_none() {
325-
vals[optid].push(Val((i_arg.clone()).unwrap()));
325+
vals[optid].push(Val((i_arg.clone()).get()));
326326
} else if name_pos < names.len() ||
327327
i + 1 == l || is_arg(args[i + 1]) {
328328
vals[optid].push(Given);
329329
} else { i += 1; vals[optid].push(Val(args[i].clone())); }
330330
}
331331
Yes => {
332332
if !i_arg.is_none() {
333-
vals[optid].push(Val(i_arg.clone().unwrap()));
333+
vals[optid].push(Val(i_arg.clone().get()));
334334
} else if i + 1 == l {
335335
return Err(ArgumentMissing(name_str(nm)));
336336
} else { i += 1; vals[optid].push(Val(args[i].clone())); }

0 commit comments

Comments
 (0)