Skip to content

Commit e86980e

Browse files
committed
---
yaml --- r: 106431 b: refs/heads/auto c: 5f33588 h: refs/heads/master i: 106429: 798bf69 106427: 5474fca 106423: 8c1dd0e 106415: 93f71d3 106399: 0ac1022 106367: 246e84f v: v3
1 parent 8ac1fc2 commit e86980e

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 8ad7e5481f970ba8d1103b4cc20a71335aba466e
16+
refs/heads/auto: 5f33588d75966b939df288cf2125e9906e15cf82
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libgetopts/lib.rs

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
#![deny(missing_doc)]
8888
#![deny(deprecated_owned_vector)]
8989

90+
#![allow(visible_private_types)] // NOTE: remove after a stage0 snap
91+
9092
#[cfg(test)] #[phase(syntax, link)] extern crate log;
9193

9294
use std::cmp::Eq;
@@ -130,31 +132,31 @@ pub enum Occur {
130132
#[deriving(Clone, Eq)]
131133
pub struct Opt {
132134
/// Name of the option
133-
name: Name,
135+
pub name: Name,
134136
/// Whether it has an argument
135-
hasarg: HasArg,
137+
pub hasarg: HasArg,
136138
/// How often it can occur
137-
occur: Occur,
139+
pub occur: Occur,
138140
/// Which options it aliases
139-
priv aliases: Vec<Opt> ,
141+
pub aliases: Vec<Opt> ,
140142
}
141143

142144
/// One group of options, e.g., both -h and --help, along with
143145
/// their shared description and properties.
144146
#[deriving(Clone, Eq)]
145147
pub struct OptGroup {
146148
/// Short Name of the `OptGroup`
147-
short_name: ~str,
149+
pub short_name: ~str,
148150
/// Long Name of the `OptGroup`
149-
long_name: ~str,
151+
pub long_name: ~str,
150152
/// Hint
151-
hint: ~str,
153+
pub hint: ~str,
152154
/// Description
153-
desc: ~str,
155+
pub desc: ~str,
154156
/// Whether it has an argument
155-
hasarg: HasArg,
157+
pub hasarg: HasArg,
156158
/// How often it can occur
157-
occur: Occur
159+
pub occur: Occur
158160
}
159161

160162
/// Describes wether an option is given at all or has a value.
@@ -169,11 +171,12 @@ enum Optval {
169171
#[deriving(Clone, Eq)]
170172
pub struct Matches {
171173
/// Options that matched
172-
priv opts: Vec<Opt> ,
174+
opts: Vec<Opt> ,
173175
/// Values of the Options that matched
174-
priv vals: Vec<Vec<Optval> > ,
176+
vals: Vec<Vec<Optval> > ,
175177
/// Free string fragments
176-
free: Vec<~str> }
178+
pub free: Vec<~str>,
179+
}
177180

178181
/// The type returned when the command line does not conform to the
179182
/// expected format. Call the `to_err_msg` method to retrieve the

0 commit comments

Comments
 (0)