File tree 2 files changed +4
-8
lines changed 2 files changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -185,18 +185,14 @@ impl Name {
185
185
}
186
186
187
187
impl Matches {
188
- /// FIXME: #9311 This used to be private, but rustpkg somehow managed to depend on it.
189
- /// No idea what this does.
190
- pub fn opt_vals ( & self , nm : & str ) -> ~[ Optval ] {
188
+ fn opt_vals ( & self , nm : & str ) -> ~[ Optval ] {
191
189
match find_opt ( self . opts , Name :: from_str ( nm) ) {
192
190
Some ( id) => self . vals [ id] . clone ( ) ,
193
191
None => fail ! ( "No option '{}' defined" , nm)
194
192
}
195
193
}
196
194
197
- /// FIXME: #9311 This used to be private, but rustpkg somehow managed to depend on it.
198
- /// No idea what this does.
199
- pub fn opt_val ( & self , nm : & str ) -> Option < Optval > {
195
+ fn opt_val ( & self , nm : & str ) -> Option < Optval > {
200
196
let vals = self . opt_vals ( nm) ;
201
197
if ( vals. is_empty ( ) ) {
202
198
None
Original file line number Diff line number Diff line change @@ -763,7 +763,7 @@ pub fn main_args(args: &[~str]) -> int {
763
763
matches. opt_present ( "help" ) ;
764
764
let no_link = matches. opt_present ( "no-link" ) ;
765
765
let no_trans = matches. opt_present ( "no-trans" ) ;
766
- let supplied_sysroot = matches. opt_val ( "sysroot" ) ;
766
+ let supplied_sysroot = matches. opt_str ( "sysroot" ) ;
767
767
let generate_asm = matches. opt_present ( "S" ) ||
768
768
matches. opt_present ( "assembly" ) ;
769
769
let parse_only = matches. opt_present ( "parse-only" ) ;
@@ -895,7 +895,7 @@ pub fn main_args(args: &[~str]) -> int {
895
895
let mut remaining_args: ~[ ~str ] = remaining_args. map ( |s| ( * s) . clone ( ) ) . collect ( ) ;
896
896
remaining_args. shift ( ) ;
897
897
let sroot = match supplied_sysroot {
898
- Some ( getopts :: Val ( s ) ) => Path :: new ( s) ,
898
+ Some ( s ) => Path :: new ( s) ,
899
899
_ => filesearch:: get_or_default_sysroot ( )
900
900
} ;
901
901
You can’t perform that action at this time.
0 commit comments