diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-08 09:24:08 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-08 09:24:08 -0800 |
| commit | 4281bd1932bf185e1154f7a79832bbd2d9155e41 (patch) | |
| tree | 27263299612651b57cb595a2cebf4830dc113904 /src/test/compile-fail/tutorial-suffix-inference-test.rs | |
| parent | 8ed88c11af9495e7119da4ac59f329a33cedac59 (diff) | |
| parent | a661bd6575dd3fac17cf77fdea8b76ca790ac212 (diff) | |
| download | rust-4281bd1932bf185e1154f7a79832bbd2d9155e41.tar.gz rust-4281bd1932bf185e1154f7a79832bbd2d9155e41.zip | |
rollup merge of #20754: nikomatsakis/int-feature
Conflicts: src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs src/test/compile-fail/issue-2590.rs src/test/compile-fail/lint-stability.rs src/test/compile-fail/slice-mut-2.rs src/test/compile-fail/std-uncopyable-atomics.rs
Diffstat (limited to 'src/test/compile-fail/tutorial-suffix-inference-test.rs')
| -rw-r--r-- | src/test/compile-fail/tutorial-suffix-inference-test.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/compile-fail/tutorial-suffix-inference-test.rs b/src/test/compile-fail/tutorial-suffix-inference-test.rs index 85ad302f3ed..1b44c7e8128 100644 --- a/src/test/compile-fail/tutorial-suffix-inference-test.rs +++ b/src/test/compile-fail/tutorial-suffix-inference-test.rs @@ -23,7 +23,7 @@ fn main() { let a = 3is; - fn identity_i(n: isize) -> int { n } + fn identity_i(n: isize) -> isize { n } identity_i(a); // ok identity_u16(a); |