diff options
| author | bors <bors@rust-lang.org> | 2014-08-28 23:56:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-28 23:56:20 +0000 |
| commit | 2e92c67dc0318a52fe42c3c0bca408f76c7feb61 (patch) | |
| tree | 1a90b5802f53f36eda0212ac1b02ebd521161f25 /src/compiletest/runtest.rs | |
| parent | 1a33d7a54170cd2904cebc7a6fd2d1da471ff64e (diff) | |
| parent | 9a8233d3772fbdb3d496aac3e4693e6d4c30e125 (diff) | |
| download | rust-2e92c67dc0318a52fe42c3c0bca408f76c7feb61.tar.gz rust-2e92c67dc0318a52fe42c3c0bca408f76c7feb61.zip | |
auto merge of #16664 : aturon/rust/stabilize-option-result, r=alexcrichton
Per API meeting https://github.com/rust-lang/meeting-minutes/blob/master/Meeting-API-review-2014-08-13.md # Changes to `core::option` Most of the module is marked as stable or unstable; most of the unstable items are awaiting resolution of conventions issues. However, a few methods have been deprecated, either due to lack of use or redundancy: * `take_unwrap`, `get_ref` and `get_mut_ref` (redundant, and we prefer for this functionality to go through an explicit .unwrap) * `filtered` and `while` * `mutate` and `mutate_or_set` * `collect`: this functionality is being moved to a new `FromIterator` impl. # Changes to `core::result` Most of the module is marked as stable or unstable; most of the unstable items are awaiting resolution of conventions issues. * `collect`: this functionality is being moved to a new `FromIterator` impl. * `fold_` is deprecated due to lack of use * Several methods found in `core::option` are added here, including `iter`, `as_slice`, and variants. Due to deprecations, this is a: [breaking-change]
Diffstat (limited to 'src/compiletest/runtest.rs')
| -rw-r--r-- | src/compiletest/runtest.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index b36bc96cd35..7a0245164ec 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -1526,7 +1526,7 @@ fn compile_cc_with_clang_and_save_bitcode(config: &Config, _props: &TestProps, let testcc = testfile.with_extension("cc"); let proc_args = ProcArgs { // FIXME (#9639): This needs to handle non-utf8 paths - prog: config.clang_path.get_ref().as_str().unwrap().to_string(), + prog: config.clang_path.as_ref().unwrap().as_str().unwrap().to_string(), args: vec!("-c".to_string(), "-emit-llvm".to_string(), "-o".to_string(), @@ -1542,7 +1542,7 @@ fn extract_function_from_bitcode(config: &Config, _props: &TestProps, let bitcodefile = output_base_name(config, testfile).with_extension("bc"); let bitcodefile = append_suffix_to_stem(&bitcodefile, suffix); let extracted_bc = append_suffix_to_stem(&bitcodefile, "extract"); - let prog = config.llvm_bin_path.get_ref().join("llvm-extract"); + let prog = config.llvm_bin_path.as_ref().unwrap().join("llvm-extract"); let proc_args = ProcArgs { // FIXME (#9639): This needs to handle non-utf8 paths prog: prog.as_str().unwrap().to_string(), @@ -1559,7 +1559,7 @@ fn disassemble_extract(config: &Config, _props: &TestProps, let bitcodefile = append_suffix_to_stem(&bitcodefile, suffix); let extracted_bc = append_suffix_to_stem(&bitcodefile, "extract"); let extracted_ll = extracted_bc.with_extension("ll"); - let prog = config.llvm_bin_path.get_ref().join("llvm-dis"); + let prog = config.llvm_bin_path.as_ref().unwrap().join("llvm-dis"); let proc_args = ProcArgs { // FIXME (#9639): This needs to handle non-utf8 paths prog: prog.as_str().unwrap().to_string(), |