Remove `usable_size` APIs #69609

TimDiekmann · 2020-03-01T11:33:43Z

This removes the usable size APIs:

remove usable_size (obv)
change return type of allocating methods to include the allocated size
remove _excess API

r? @Amanieu
closes rust-lang/wg-allocators#17

Amanieu

The doc comments for the changed trait methods need to:

Explain what the returned usize is and how it is different from layout.size().
Say that simply returning layout.size() is enough if your allocator doesn't support this.

Amanieu · 2020-03-01T15:40:20Z

src/libcore/alloc.rs

@@ -1072,18 +923,17 @@ pub unsafe trait AllocRef {
    /// function; clients are expected either to be able to recover from
    /// `grow_in_place` failures without aborting, or to fall back on
    /// another reallocation method before resorting to an abort.
+    #[inline]


Why is this inline when none of the other functions are?

Amanieu · 2020-03-01T15:41:14Z

src/libcore/alloc.rs

@@ -1153,17 +1003,16 @@ pub unsafe trait AllocRef {
    /// function; clients are expected either to be able to recover from
    /// `shrink_in_place` failures without aborting, or to fall back
    /// on another reallocation method before resorting to an abort.
+    #[inline]


Why is this inline when none of the other functions are?

Both cases of #[inline] are no-ops and just return Err.

TimDiekmann · 2020-03-01T19:19:35Z

I'll add those snippets to the docs. Thanks for reviewing!

TimDiekmann · 2020-03-02T18:03:03Z

Explain what the returned usize is and how it is different from layout.size().

Say that simply returning layout.size() is enough if your allocator doesn't support this.

@Amanieu Do you think this should be mentioned on every allocating method or gobally on the trait?

Amanieu · 2020-03-02T19:00:21Z

I think it should be on all methods.

rust-highfive · 2020-03-02T20:36:37Z

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2020-03-02T20:16:47.3015407Z ========================== Starting Command Output ===========================
2020-03-02T20:16:47.3018334Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/5971294d-6919-4080-ac50-a819bc5f88f5.sh
2020-03-02T20:16:47.3018730Z 
2020-03-02T20:16:47.3024025Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-02T20:16:47.3044334Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/69609/merge to s
2020-03-02T20:16:47.3047203Z Task         : Get sources
2020-03-02T20:16:47.3047437Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-02T20:16:47.3047663Z Version      : 1.0.0
2020-03-02T20:16:47.3047890Z Author       : Microsoft
---
2020-03-02T20:16:48.5963412Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-02T20:16:48.5970906Z ##[command]git config gc.auto 0
2020-03-02T20:16:48.5995786Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-02T20:16:48.6004214Z ##[command]git config --get-all http.proxy
2020-03-02T20:16:48.6020234Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/69609/merge:refs/remotes/pull/69609/merge

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

src/libcore/alloc.rs

TimDiekmann · 2020-03-02T23:10:26Z

I have applied your suggestions and squashed the commits.

Amanieu · 2020-03-02T23:23:41Z

@bors r+ rollup=always

bors · 2020-03-02T23:23:43Z

📌 Commit d8e3557 has been approved by Amanieu

@Amanieu

Remove `usable_size` APIs This removes the usable size APIs: - remove `usable_size` (obv) - change return type of allocating methods to include the allocated size - remove `_excess` API r? @Amanieu closes rust-lang/wg-allocators#17

@ghost

Rollup of 9 pull requests Successful merges: - #69565 (miri engine: turn some debug_assert into assert) - #69609 (Remove `usable_size` APIs) - #69620 (doc(librustc_error_codes): add long error explanation for E0719) - #69626 (Toolstate: don't duplicate nightly tool list.) - #69628 (Fix a leak in `DiagnosticBuilder::into_diagnostic`.) - #69633 (Update my mailmap entry) - #69634 (clean up E0378 explanation) - #69637 (Don't convert Results to Options just for matching.) - #69641 (Update books) Failed merges: r? @ghost

@ghost

Rollup of 9 pull requests Successful merges: - #69213 (Improve documentation on iterators length) - #69609 (Remove `usable_size` APIs) - #69619 (more cleanups) - #69620 (doc(librustc_error_codes): add long error explanation for E0719) - #69626 (Toolstate: don't duplicate nightly tool list.) - #69628 (Fix a leak in `DiagnosticBuilder::into_diagnostic`.) - #69633 (Update my mailmap entry) - #69634 (clean up E0378 explanation) - #69637 (Don't convert Results to Options just for matching.) Failed merges: r? @ghost

rust-highfive assigned Amanieu Mar 1, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2020

Amanieu requested changes Mar 1, 2020

View reviewed changes

Amanieu reviewed Mar 2, 2020

View reviewed changes

src/libcore/alloc.rs Outdated Show resolved Hide resolved

src/libcore/alloc.rs Outdated Show resolved Hide resolved

src/libcore/alloc.rs Outdated Show resolved Hide resolved

src/libcore/alloc.rs Outdated Show resolved Hide resolved

src/libcore/alloc.rs Outdated Show resolved Hide resolved

Remove usable_size APIs

d8e3557

TimDiekmann force-pushed the excess branch from 43b9c88 to d8e3557 Compare March 2, 2020 23:09

Amanieu approved these changes Mar 2, 2020

View reviewed changes

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 Mar 2, 2020

Dylan-DPC-zz mentioned this pull request Mar 3, 2020

Rollup of 9 pull requests #69652

Closed

JohnTitor mentioned this pull request Mar 3, 2020

Rollup of 9 pull requests #69666

Merged

bors merged commit 4699b29 into rust-lang:master Mar 3, 2020

JohnTitor mentioned this pull request Mar 3, 2020

Rustup to latest rustc rust-lang/nomicon#203

Merged

TimDiekmann mentioned this pull request Mar 4, 2020

Shrinking should never fail rust-lang/wg-allocators#42

Closed

TimDiekmann deleted the excess branch March 5, 2020 00:28

phil-opp mentioned this pull request Mar 6, 2020

Fix build on nightly 1.43.0 (05-03-2020). rust-osdev/linked-list-allocator#25

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `usable_size` APIs #69609

Remove `usable_size` APIs #69609

TimDiekmann commented Mar 1, 2020

Amanieu left a comment

Amanieu Mar 1, 2020

Amanieu Mar 1, 2020

TimDiekmann Mar 1, 2020

TimDiekmann commented Mar 1, 2020

TimDiekmann commented Mar 2, 2020

Amanieu commented Mar 2, 2020

rust-highfive commented Mar 2, 2020

TimDiekmann commented Mar 2, 2020 •

edited

Loading

Amanieu commented Mar 2, 2020

bors commented Mar 2, 2020

Remove usable_size APIs #69609

Remove usable_size APIs #69609

Conversation

TimDiekmann commented Mar 1, 2020

Amanieu left a comment

Choose a reason for hiding this comment

Amanieu Mar 1, 2020

Choose a reason for hiding this comment

Amanieu Mar 1, 2020

Choose a reason for hiding this comment

TimDiekmann Mar 1, 2020

Choose a reason for hiding this comment

TimDiekmann commented Mar 1, 2020

TimDiekmann commented Mar 2, 2020

Amanieu commented Mar 2, 2020

rust-highfive commented Mar 2, 2020

TimDiekmann commented Mar 2, 2020 • edited Loading

Amanieu commented Mar 2, 2020

bors commented Mar 2, 2020

Remove `usable_size` APIs #69609

Remove `usable_size` APIs #69609

TimDiekmann commented Mar 2, 2020 •

edited

Loading