Skip to content

Commit ca08540

Browse files
committed
Fix fallout from coercion removal
1 parent 803aacd commit ca08540

File tree

142 files changed

+1271
-1285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+1271
-1285
lines changed

src/compiletest/runtest.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
399399
procsrv::run("",
400400
config.adb_path.as_slice(),
401401
None,
402-
[
402+
&[
403403
"push".to_string(),
404404
exe_file.as_str().unwrap().to_string(),
405405
config.adb_test_dir.clone()
@@ -411,7 +411,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
411411
procsrv::run("",
412412
config.adb_path.as_slice(),
413413
None,
414-
[
414+
&[
415415
"forward".to_string(),
416416
"tcp:5039".to_string(),
417417
"tcp:5039".to_string()
@@ -432,7 +432,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
432432
config.adb_path
433433
.as_slice(),
434434
None,
435-
[
435+
&[
436436
"shell".to_string(),
437437
adb_arg.clone()
438438
],
@@ -746,7 +746,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
746746
cmd.arg(lldb_script_path)
747747
.arg(test_executable)
748748
.arg(debugger_script)
749-
.env_set_all([("PYTHONPATH", config.lldb_python_dir.clone().unwrap().as_slice())]);
749+
.env_set_all(&[("PYTHONPATH", config.lldb_python_dir.clone().unwrap().as_slice())]);
750750

751751
let (status, out, err) = match cmd.spawn() {
752752
Ok(process) => {
@@ -1142,11 +1142,11 @@ struct ProcRes {
11421142

11431143
fn compile_test(config: &Config, props: &TestProps,
11441144
testfile: &Path) -> ProcRes {
1145-
compile_test_(config, props, testfile, [])
1145+
compile_test_(config, props, testfile, &[])
11461146
}
11471147

11481148
fn jit_test(config: &Config, props: &TestProps, testfile: &Path) -> ProcRes {
1149-
compile_test_(config, props, testfile, ["--jit".to_string()])
1149+
compile_test_(config, props, testfile, &["--jit".to_string()])
11501150
}
11511151

11521152
fn compile_test_(config: &Config, props: &TestProps,
@@ -1507,7 +1507,7 @@ fn _arm_exec_compiled_test(config: &Config,
15071507
let copy_result = procsrv::run("",
15081508
config.adb_path.as_slice(),
15091509
None,
1510-
[
1510+
&[
15111511
"push".to_string(),
15121512
args.prog.clone(),
15131513
config.adb_test_dir.clone()
@@ -1624,7 +1624,7 @@ fn _arm_push_aux_shared_library(config: &Config, testfile: &Path) {
16241624
let copy_result = procsrv::run("",
16251625
config.adb_path.as_slice(),
16261626
None,
1627-
[
1627+
&[
16281628
"push".to_string(),
16291629
file.as_str()
16301630
.unwrap()

src/doc/guide-testing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ will be counted as a failure. For example:
8484
#[test]
8585
#[should_fail]
8686
fn test_out_of_bounds_failure() {
87-
let v: &[int] = [];
87+
let v: &[int] = &[];
8888
v[0];
8989
}
9090
~~~

0 commit comments

Comments
 (0)