diff options
| author | bors <bors@rust-lang.org> | 2020-01-20 05:56:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-20 05:56:53 +0000 |
| commit | 900811e43047fc5593f39b0363373530b02c87e0 (patch) | |
| tree | 34bc5482693fb417276dbcb216eb14f82ad952a6 /src/test/codegen | |
| parent | 29b854fb741809c29764e33fc17c32ba9c6523ba (diff) | |
| parent | 0259c103853afe4b641a1a3f36ca7daa92c2b0e2 (diff) | |
| download | rust-900811e43047fc5593f39b0363373530b02c87e0.tar.gz rust-900811e43047fc5593f39b0363373530b02c87e0.zip | |
Auto merge of #68380 - Dylan-DPC:rollup-a7moqmr, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #68326 (rustdoc: Catch fatal errors when syntax highlighting) - #68335 (Remove real_drop_in_place) - #68353 (Remove `rustc_error_codes` deps except in `rustc_driver`) - #68357 (rustdoc: Fix handling of compile errors when running `rustdoc --test`) - #68365 (Clean up error codes) Failed merges: r? @ghost
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/drop.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/codegen/drop.rs b/src/test/codegen/drop.rs index 959929fbafb..0c7f3bb2020 100644 --- a/src/test/codegen/drop.rs +++ b/src/test/codegen/drop.rs @@ -21,7 +21,7 @@ pub fn droppy() { // regular function exit. We used to have problems with quadratic growths of drop calls in such // functions. // FIXME(eddyb) the `void @` forces a match on the instruction, instead of the -// comment, that's `; call core::ptr::real_drop_in_place::<drop::SomeUniqueName>` +// comment, that's `; call core::intrinsics::drop_in_place::<drop::SomeUniqueName>` // for the `v0` mangling, should switch to matching on that once `legacy` is gone. // CHECK-NOT: invoke void @{{.*}}drop_in_place{{.*}}SomeUniqueName // CHECK: call void @{{.*}}drop_in_place{{.*}}SomeUniqueName |