OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

extra / rustpkg: Make getopts::opt_val private again

Browse Source 
and use opt_str instead of opt_val in rustpkg

Closes #9311
This commit is contained in:
Tim Chevalier 2013-11-08 16:20:25 -08:00
parent a594a999fb
commit 06b2905ee1
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libextra/getopts.rs
View File

@ -185,18 +185,14 @@ impl Name {
} }
impl Matches { impl Matches {
/// FIXME: #9311 This used to be private, but rustpkg somehow managed to depend on it. fn opt_vals(&self, nm: &str) -> ~[Optval] {
/// No idea what this does.
pub fn opt_vals(&self, nm: &str) -> ~[Optval] {
match find_opt(self.opts, Name::from_str(nm)) { match find_opt(self.opts, Name::from_str(nm)) {
Some(id) => self.vals[id].clone(), Some(id) => self.vals[id].clone(),
None => fail!("No option '{}' defined", nm) None => fail!("No option '{}' defined", nm)
} }
} }
/// FIXME: #9311 This used to be private, but rustpkg somehow managed to depend on it. fn opt_val(&self, nm: &str) -> Option<Optval> {
/// No idea what this does.
pub fn opt_val(&self, nm: &str) -> Option<Optval> {
let vals = self.opt_vals(nm); let vals = self.opt_vals(nm);
if (vals.is_empty()) { if (vals.is_empty()) {
None None

4
src/librustpkg/lib.rs
View File

@ -762,7 +762,7 @@ pub fn main_args(args: &[~str]) -> int {
matches.opt_present("help"); matches.opt_present("help");
let no_link = matches.opt_present("no-link"); let no_link = matches.opt_present("no-link");
let no_trans = matches.opt_present("no-trans"); let no_trans = matches.opt_present("no-trans");
let supplied_sysroot = matches.opt_val("sysroot"); let supplied_sysroot = matches.opt_str("sysroot");
let generate_asm = matches.opt_present("S") || let generate_asm = matches.opt_present("S") ||
matches.opt_present("assembly"); matches.opt_present("assembly");
let parse_only = matches.opt_present("parse-only"); let parse_only = matches.opt_present("parse-only");
@ -894,7 +894,7 @@ pub fn main_args(args: &[~str]) -> int {
let mut remaining_args: ~[~str] = remaining_args.map(|s| (*s).clone()).collect(); let mut remaining_args: ~[~str] = remaining_args.map(|s| (*s).clone()).collect();
remaining_args.shift(); remaining_args.shift();
let sroot = match supplied_sysroot { let sroot = match supplied_sysroot {
Some(getopts::Val(s)) => Path::new(s), Some(s) => Path::new(s),
_ => filesearch::get_or_default_sysroot() _ => filesearch::get_or_default_sysroot()
}; };