Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #68405

Merged
merged 25 commits into from
Jan 21, 2020
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2ccf65c
Remove appendix from LICENCE-APACHE
XAMPPRocky Dec 30, 2019
d088d8a
Revert previous attempt at detecting unsatisfiable predicates
Aaron1011 Jan 16, 2020
171fe82
Filter and test predicates using `normalize_and_test_predicates` for …
Aaron1011 Jan 16, 2020
c431cd7
Fix typo
Aaron1011 Jan 17, 2020
3fef3d8
Add @weiznich's regression test
Aaron1011 Jan 17, 2020
8fa8b81
Fix some tests failing in `--pass check` mode
petrochenkov Jan 17, 2020
45dd44c
Add `riscv64gc-unknown-linux-gnu` into target list in build-manifest
msizanoen1 Jan 18, 2020
fd90e56
Add failing #[track_caller] test with fn pointers.
anp Jan 17, 2020
0ee9221
InstanceDef::requires_caller_location limited to items.
anp Jan 17, 2020
19d8527
rustc_mir: don't require a self argument for ReifyShim.
eddyb Jan 19, 2020
72dffac
Test that ReifyShim + caller_location return the def site.
anp Jan 19, 2020
6be3446
Added minor clarification to specification of realloc.
mjp41 Jan 20, 2020
fdef4f1
Delete unused "next" variants from formatting infrastructure
Mark-Simulacrum Jan 1, 2020
4919b96
Move run/getcount to functions
Mark-Simulacrum Jan 1, 2020
9ae32c9
Drop args from Formatter
Mark-Simulacrum Jan 1, 2020
a804a45
Fix UI test
Mark-Simulacrum Jan 20, 2020
3e0bfe1
rustdoc: Correct order of `async` and `unsafe` in `async unsafe fn`s
ollie27 Jan 20, 2020
ec7f209
Rollup merge of #67734 - XAMPPRocky:master, r=skade
JohnTitor Jan 20, 2020
e1bd9b3
Rollup merge of #67795 - Mark-Simulacrum:fmt-argument, r=dtolnay
JohnTitor Jan 20, 2020
eff6381
Rollup merge of #68290 - petrochenkov:passcheck, r=oli-obk
JohnTitor Jan 20, 2020
bff216c
Rollup merge of #68297 - Aaron1011:fix/new-const-prop-bounds, r=oli-obk
JohnTitor Jan 20, 2020
8d2bac8
Rollup merge of #68302 - anp:caller-fn-ptr, r=eddyb,oli-obk
JohnTitor Jan 20, 2020
67b87c8
Rollup merge of #68339 - msizanoen1:patch-1, r=pietroalbini
JohnTitor Jan 20, 2020
32ecb6f
Rollup merge of #68381 - mjp41:master, r=Dylan-DPC
JohnTitor Jan 20, 2020
f6406f7
Rollup merge of #68397 - ollie27:rustdoc_async_unsafe, r=Centril
JohnTitor Jan 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added minor clarification to specification of realloc.
The `layout` for the returned allocation of a `realloc` is
only implicitly specified.  This change makes it explicit.
  • Loading branch information
mjp41 committed Jan 20, 2020
commit 6be3446f92b444cd6584c7948be9f7cf20ce5518
3 changes: 2 additions & 1 deletion src/libcore/alloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,8 @@ pub unsafe trait GlobalAlloc {
/// The memory may or may not have been deallocated,
/// and should be considered unusable (unless of course it was
/// transferred back to the caller again via the return value of
/// this method).
/// this method). The new memory block is allocated with `layout`, but
/// with the `size` updated to `new_size`.
///
/// If this method returns null, then ownership of the memory
/// block has not been transferred to this allocator, and the
Expand Down