diff options
| author | bors <bors@rust-lang.org> | 2017-02-25 12:29:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-25 12:29:32 +0000 |
| commit | 1572bf104dbf65d58bd6b889fa46229c9b92d6f9 (patch) | |
| tree | 0cd0f02c7a7634ab5e86d2e14f74aeaf4758382e /src/test/codegen/function-arguments.rs | |
| parent | e78aa5d7546d5db493ec12328368ab0c249c2a94 (diff) | |
| parent | 207c76306037776c0e72456d5a0497e430c6753c (diff) | |
| download | rust-1572bf104dbf65d58bd6b889fa46229c9b92d6f9.tar.gz rust-1572bf104dbf65d58bd6b889fa46229c9b92d6f9.zip | |
Auto merge of #40091 - eddyb:rollup, r=eddyb
Rollup of 28 pull requests - Successful merges: #39859, #39864, #39888, #39903, #39905, #39914, #39945, #39950, #39953, #39961, #39980, #39988, #39993, #39995, #40019, #40020, #40022, #40024, #40025, #40026, #40027, #40031, #40035, #40037, #40038, #40064, #40069, #40086 - Failed merges: #39927, #40008, #40047
Diffstat (limited to 'src/test/codegen/function-arguments.rs')
| -rw-r--r-- | src/test/codegen/function-arguments.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/function-arguments.rs b/src/test/codegen/function-arguments.rs index c373cdb76c5..76313b158ab 100644 --- a/src/test/codegen/function-arguments.rs +++ b/src/test/codegen/function-arguments.rs @@ -121,13 +121,13 @@ pub fn unsafe_slice(_: &[UnsafeInner]) { fn str(_: &[u8]) { } -// CHECK: @trait_borrow(i8* nonnull, void (i8*)** nonnull) +// CHECK: @trait_borrow(i8* nonnull, void (i8*)** noalias nonnull readonly) // FIXME #25759 This should also have `nocapture` #[no_mangle] fn trait_borrow(_: &Drop) { } -// CHECK: @trait_box(i8* noalias nonnull, void (i8*)** nonnull) +// CHECK: @trait_box(i8* noalias nonnull, void (i8*)** noalias nonnull readonly) #[no_mangle] fn trait_box(_: Box<Drop>) { } |