Skip to content

Commit 62c634b

Browse files
committed
---
yaml --- r: 24560 b: refs/heads/try2 c: a52135f h: refs/heads/master v: v3
1 parent a79e4d2 commit 62c634b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
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: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 34660f099ed50a0242b197430abf102dc0d7b322
8+
refs/heads/try2: a52135f5a75b35d6962a30a5d200c786285c3089
99
refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/getopts.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,17 @@ fn getopts(args: ~[str], opts: ~[opt]) -> result unsafe {
229229
/* In a series of potential options (eg. -aheJ), if we see
230230
one which takes an argument, we assume all subsequent
231231
characters make up the argument. This allows options
232-
such as -L/usr/local/lib/foo to be interpreted correctly
232+
such as -L/usr/local/lib/foo to be interpreted
233+
correctly
233234
*/
235+
234236
alt find_opt(opts, opt) {
235237
some(id) {
236238
last_valid_opt_id = option::some(id);
237239
}
238240
none {
239-
let arg_follows = option::is_some(last_valid_opt_id) &&
241+
let arg_follows =
242+
option::is_some(last_valid_opt_id) &&
240243
alt opts[option::get(last_valid_opt_id)].hasarg {
241244
yes | maybe { true }
242245
no { false }

0 commit comments

Comments
 (0)