diff options
| author | bors <bors@rust-lang.org> | 2019-05-14 20:50:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-14 20:50:26 +0000 |
| commit | 372be4f360ce42b1a10126a711189796f8440ab4 (patch) | |
| tree | aa31fd8b1b3e65c640222f29ec4c671dbceb08fa /src/test/codegen | |
| parent | f59c71eb8ed808347c1e4245b842d673c75daeb6 (diff) | |
| parent | 2e844ef4491675e93d22be7d5bfbfd62df904959 (diff) | |
Auto merge of #60834 - Centril:rollup-fikyi9i, r=Centril
Rollup of 9 pull requests Successful merges: - #60130 (Add implementations of last in terms of next_back on a bunch of DoubleEndedIterators) - #60443 (as_ptr returns a read-only pointer) - #60444 (forego caching for all participants in cycles, apart from root node) - #60719 (Allow subdirectories to be tested by x.py test) - #60780 (fix Miri) - #60788 (default to $ARCH-apple-macosx10.7.0 LLVM triple for darwin targets) - #60799 (Allow late-bound regions in existential types) - #60808 (Improve the "must use" lint for `Future`) - #60819 (submodules: update clippy from 3710ec59 to ad3269c4) Failed merges: r? @ghost
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/i686-no-macosx-deployment-target.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/x86_64-no-macosx-deployment-target.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/i686-no-macosx-deployment-target.rs b/src/test/codegen/i686-no-macosx-deployment-target.rs index eb826590523..1cebc49236f 100644 --- a/src/test/codegen/i686-no-macosx-deployment-target.rs +++ b/src/test/codegen/i686-no-macosx-deployment-target.rs @@ -19,7 +19,7 @@ pub struct Bool { b: bool, } -// CHECK: target triple = "i686-apple-darwin" +// CHECK: target triple = "i686-apple-macosx10.7.0" #[no_mangle] pub extern "C" fn structbool() -> Bool { Bool { b: true } diff --git a/src/test/codegen/x86_64-no-macosx-deployment-target.rs b/src/test/codegen/x86_64-no-macosx-deployment-target.rs index 58a11d1095b..c5ac73b54e1 100644 --- a/src/test/codegen/x86_64-no-macosx-deployment-target.rs +++ b/src/test/codegen/x86_64-no-macosx-deployment-target.rs @@ -19,7 +19,7 @@ pub struct Bool { b: bool, } -// CHECK: target triple = "x86_64-apple-darwin" +// CHECK: target triple = "x86_64-apple-macosx10.7.0" #[no_mangle] pub extern "C" fn structbool() -> Bool { Bool { b: true } |