diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-08-21 22:09:50 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-08-21 22:09:50 -0700 |
| commit | c74ff320eef258ad1bcd5a4c4b7f8294e4f9cb30 (patch) | |
| tree | 69772037f267994aab74da0ac0700f1fd077daf0 | |
| parent | 04c66c30a7deaf2bfc1b9ba17df890e6bfd96c21 (diff) | |
| download | rust-c74ff320eef258ad1bcd5a4c4b7f8294e4f9cb30.tar.gz rust-c74ff320eef258ad1bcd5a4c4b7f8294e4f9cb30.zip | |
More merge conflicts
| -rw-r--r-- | src/librustc_mir/shim.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_mir/shim.rs b/src/librustc_mir/shim.rs index 039651b7e93..1e0858d6864 100644 --- a/src/librustc_mir/shim.rs +++ b/src/librustc_mir/shim.rs @@ -335,6 +335,7 @@ impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> { ), IndexVec::new(), self.sig.output(), + None, self.local_decls, self.sig.inputs().len(), vec![], |