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.

Sign up for GitHub

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

Jump to bottom

Remove in-place allocation and revert to separate methods for zeroed allocations #74850

Merged
merged 6 commits into from
Aug 4, 2020
Merged

Remove in-place allocation and revert to separate methods for zeroed allocations #74850

merged 6 commits into from
Aug 4, 2020

Conversation

TimDiekmann
Copy link
Member

@rust-highfive
Copy link
Collaborator

r? @shepmaster

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 27, 2020
@bors
Copy link
Contributor

bors commented Jul 28, 2020

☔ The latest upstream changes (presumably #73265) made this pull request unmergeable. Please resolve the merge conflicts.

@TimDiekmann
Copy link
Member Author

r? @SimonSapin

@TimDiekmann
Copy link
Member Author

r? @Amanieu

@rust-highfive rust-highfive assigned Amanieu and unassigned SimonSapin Aug 1, 2020
@TimDiekmann TimDiekmann mentioned this pull request Aug 1, 2020
Closed
Amanieu
Amanieu reviewed Aug 1, 2020
View reviewed changes
Copy link
Member

@Amanieu Amanieu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you also going to remove MemoryBlock in this PR or will you be doing it later in a separate PR?

library/core/src/alloc/mod.rs Outdated Show resolved Hide resolved
@TimDiekmann
Copy link
Member Author

Are you also going to remove MemoryBlock in this PR or will you be doing it later in a separate PR?

I'll remove MemoryBlock in another PR to keep things clean. I have the changes already made locally and it's going to be a rather small PR.

@bors
Copy link
Contributor

bors commented Aug 3, 2020

☔ The latest upstream changes (presumably #75070) made this pull request unmergeable. Please resolve the merge conflicts.

Amanieu
Amanieu reviewed Aug 3, 2020
View reviewed changes
library/core/src/alloc/mod.rs Outdated Show resolved Hide resolved
library/core/src/alloc/mod.rs Outdated Show resolved Hide resolved
library/core/src/alloc/mod.rs Outdated Show resolved Hide resolved
library/core/src/alloc/mod.rs Outdated Show resolved Hide resolved
@TimDiekmann @Amanieu
Apply suggestions from code review
6395659 
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
@TimDiekmann TimDiekmann mentioned this pull request Aug 4, 2020
Closed
@Amanieu
Copy link
Member

Amanieu commented Aug 4, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Aug 4, 2020

📌 Commit 6395659 has been approved by Amanieu

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 4, 2020
@bors
Copy link
Contributor

bors commented Aug 4, 2020

⌛ Testing commit 6395659 with merge 5f6bd6e...

@bors
Copy link
Contributor

bors commented Aug 4, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Amanieu
Pushing 5f6bd6e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 4, 2020
@bors bors merged commit 5f6bd6e into rust-lang:master Aug 4, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #74850!

Tested on commit 5f6bd6e.
Direct link to PR: #74850

💔 nomicon on windows: test-pass → test-fail (cc @Gankra @frewsxcv).
💔 nomicon on linux: test-pass → test-fail (cc @Gankra @frewsxcv).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 4, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#74850!
8c76fcc 
Tested on commit rust-lang/rust@5f6bd6e.
Direct link to PR: <rust-lang/rust#74850>

💔 nomicon on windows: test-pass → test-fail (cc @Gankra @frewsxcv).
💔 nomicon on linux: test-pass → test-fail (cc @Gankra @frewsxcv).
@bors bors mentioned this pull request Aug 4, 2020
Merged
@TimDiekmann TimDiekmann deleted the remove-in-place-alloc branch August 4, 2020 13:20
JohnTitor added a commit to JohnTitor/nomicon that referenced this pull request Aug 5, 2020
@JohnTitor
Follow-up for rust-lang/rust#74850
be0687a
@ltratt ltratt mentioned this pull request Aug 6, 2020
Merged
bors bot added a commit to softdevteam/libgc that referenced this pull request Aug 7, 2020
@bors @ltratt
Merge #19
5882ebc 
19: Update after recent rust-nightly changes. r=jacob-hughes a=ltratt

There are two PRs which affect us:

  rust-lang/rust#74850
  rust-lang/rust#75152

Henceforth, we should probably be keeping a close eye on and contributing to:

  https://github.com/rust-lang/wg-allocators/issues

Co-authored-by: Laurence Tratt <laurie@tratt.net>
bors bot added a commit to softdevteam/libgc that referenced this pull request Aug 10, 2020
@bors @ltratt
Merge #19
d20a693 
19: Update after recent rust-nightly changes. r=vext01 a=ltratt

There are two PRs which affect us:

  rust-lang/rust#74850
  rust-lang/rust#75152

Henceforth, we should probably be keeping a close eye on and contributing to:

  https://github.com/rust-lang/wg-allocators/issues

Co-authored-by: Laurence Tratt <laurie@tratt.net>
@phil-opp phil-opp mentioned this pull request Aug 13, 2020
Merged
Mark-Simulacrum added a commit to rust-lang/nomicon that referenced this pull request Aug 18, 2020
@Mark-Simulacrum
Merge pull request #233 from JohnTitor/alloc-removal
685ca70 
Follow-up for rust-lang/rust#74850
@ehuss ehuss mentioned this pull request Aug 19, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 20, 2020
@bors
Auto merge of rust-lang#75720 - ehuss:update-books, r=ehuss
f6049b6 
Update books

## nomicon

2 commits in bfe1ab96d717d1dda50e499b360f2e2f57e1750a..25854752549d44d76fbd7650e17cb4f167a0b8fb
2020-06-05 13:19:42 -0400 to 2020-08-19 16:41:48 -0400
- Follow-up of rust-lang#75152 (rust-lang/nomicon#235)
- Follow-up for rust-lang#74850 (rust-lang/nomicon#233)

## reference

7 commits in c9b2736a059469043177e1e4ed41a55d7c63ac28..1b6c4b0afab97c0230433466c97167bbbe8445f6
2020-08-03 03:34:03 -0700 to 2020-08-18 17:04:28 -0700
- Some constant/static updates. (rust-lang/reference#867)
- Add casting rules from function items to other types (rust-lang/reference#878)
- Apply joshtriplett's suggestion
- Add note clarifying 16-bit support.
- Document min pointer width.
- Update to `dyn Trait` syntax in a couple places (rust-lang/reference#875)
- mention that `#[track_caller]` on `fn main` is forbidden (rust-lang/reference#872)

## book

2 commits in 363293c1c5ce9e84ea3935a5e29ce8624801208a..c0a6a61b8205da14ac955425f74258ffd8ee065d
2020-08-03 15:56:30 -0500 to 2020-08-14 14:21:49 -0500
- Correct listing 11-10: Take tests module out of main function. (rust-lang/book#2427)
- Update link to russian translation (rust-lang/book#2423)

## rust-by-example

5 commits in 2e9271981adc32613365810f3428334c07095215..80a10e22140e28392b99d24ed02f4c6d8cb770a0
2020-07-27 13:39:16 -0500 to 2020-08-08 09:56:46 -0300
- Add tuple `..` operator example (rust-lang/rust-by-example#1368)
- Clarify wording (rust-lang/rust-by-example#1366)
- Include arc (rust-lang/rust-by-example#1365)
- Modify supertraits sample code (rust-lang/rust-by-example#1361)
- Remove mention of `try!` in `Display` example (rust-lang/rust-by-example#1357)

## embedded-book

3 commits in b5256448a2a4c1bec68b93c0847066f92f2ff5a9..0cd2ca116274b915924c3a7e07c1e046b6f19b77
2020-07-24 23:09:29 +0000 to 2020-08-19 10:33:15 +0000
- Ignore unused argument in closure  (rust-embedded/book#261)
- Fix broken sentence  (rust-embedded/book#260)
- Add additional command to try when verifying installation.  (rust-embedded/book#259)
jacob-hughes added a commit to jacob-hughes/alloy that referenced this pull request Sep 8, 2020
@jacob-hughes
Update Alloc calls after recent nightly API changes
7fa4a77 
There are two PRs which affect us:

    rust-lang#74850
    rust-lang#75152

Henceforth, we should probably be keeping a close eye on and contributing to:

    https://github.com/rust-lang/wg-allocators/issues
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Amanieu Amanieu Amanieu left review comments

Assignees

@Amanieu Amanieu

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.

Separate methods v.s. "mode" parameters
7 participants
@TimDiekmann @rust-highfive @bors @Amanieu @cuviper @shepmaster @SimonSapin