Skip to content

Rollup of 10 pull requests - #65388

Merged
bors merged 28 commits into
rust-lang:masterfrom
Centril:rollup-rhg0dvs
Oct 13, 2019
Merged

Rollup of 10 pull requests#65388
bors merged 28 commits into
rust-lang:masterfrom
Centril:rollup-rhg0dvs

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Amanieuand others added 28 commits October 8, 2019 20:34
Reciprocal throughput is improved from 2.3 to 1.7.
https://godbolt.org/z/ROMiX6
IntoStringError only implemented Error::cause, which is
deprecated. This implemements Error::source instead.
Error::cause will still work as before, thanks to the default
implementation.
The value names are used when reporting issues found by address
sanitizer or memory sanitizer. Avoid discarding names when those
sanitizers are enabled, unless explicitly requested to do otherwise.
I noticed that in documentation to `Any` trait the old trait object syntax is used, which could be confusing for newcomers, since we generally recommend using `dyn Trait` instead of just `Trait`. This PR changes the documentation comment, so that it uses `&dyn Any`, `&mut dyn Any` and `Box<dyn Any>`, correspondingly.
Co-Authored-By: Jonas Schievink <jonasschievink@gmail.com>
Split non-CAS atomic support off into target_has_atomic_load_store
This PR implements my proposed changes in rust-lang#32976 (comment) by removing `target_has_atomic = "cas"` and splitting `target_has_atomic` into two separate `cfg`s:
* `target_has_atomic = 8/16/32/64/128`: This indicates the largest width that the target can atomically CAS (which implies support for all atomic operations).
* ` target_has_atomic_load_store = 8/16/32/64/128`: This indicates the largest width that the target can support loading or storing atomically (but may not support CAS).
cc rust-lang#32976
r? @alexcrichton
vxWorks: implement get_path() and get_mode() for File fmt::Debug
improve performance of signed saturating_mul
Reciprocal throughput is improved from 2.3 to 1.7. https://godbolt.org/z/ROMiX6Fixesrust-lang#65309.
Fix typo in task::Waker
fixesrust-lang#65323
in `libstd/error.rs` there are a few mentions of `trait@Send` and `trait@Sync`. Are they wrong as well?
nounwind tests and cleanup
This is a follow-up to @pnkfelix' rust-lang#65020. In particular it adds some tests as @nagisa asked. It also does a cleanup that the original PR omitted to reduce backporting risks.
I hope I finally managed to write an uncontroversial PR in this area. ;) This should not change any behavior, just test it better.
…bluss
Implement Error::source on IntoStringError + Remove superfluous cause impls
IntoStringError only implemented `Error::cause`, which is deprecated. This implemements `Error::source` instead.
`Error::cause` will still work as before, thanks to the default implementation.
I think this was the only/last `Error` impl in the standard library to have a cause, but not a source.
…rkor
Don't discard value names when using address or memory sanitizer
The value names are used when reporting issues found by address
sanitizer or memory sanitizer. Avoid discarding names when those
sanitizers are enabled, unless explicitly requested to do otherwise.
Add `dyn` to `Any` documentation
I noticed that in documentation to `Any` trait the old trait object syntax is used, which could be confusing for newcomers, since we generally recommend using `dyn Trait` instead of just `Trait`. This PR changes the documentation comment, so that it uses `&dyn Any`, `&mut dyn Any` and `Box<dyn Any>`, correspondingly.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10 rollup=never

@bors

bors commented Oct 13, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 92b36ce has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 13, 2019
@bors

bors commented Oct 13, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 92b36ce with merge c27f756...

bors added a commit that referenced this pull request Oct 13, 2019
Rollup of 10 pull requests
Successful merges:
- #65214 (Split non-CAS atomic support off into target_has_atomic_load_store)
- #65246 (vxWorks: implement get_path() and get_mode() for File fmt::Debug)
- #65312 (improve performance of signed saturating_mul)
- #65336 (Fix typo in task::Waker)
- #65346 (nounwind tests and cleanup)
- #65347 (Fix #[unwind(abort)] with Rust ABI)
- #65366 (Implement Error::source on IntoStringError + Remove superfluous cause impls)
- #65369 (Don't discard value names when using address or memory sanitizer)
- #65370 (Add `dyn` to `Any` documentation)
- #65373 (Fix typo in docs for `Rc`)
Failed merges:
r? @ghost
@bors

bors commented Oct 13, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing c27f756 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 13, 2019
@bors
bors merged commit 92b36ce into rust-lang:masterOct 13, 2019
@Centril
Centril deleted the rollup-rhg0dvs branch October 13, 2019 21:21
@CentrilCentril added the rollup A PR which is a rollup label Oct 18, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@Centril@bors@Amanieu@BaoshanPang@tspiteri@RalfJung@faern@tmiasko@Cerber-Ursi@kalabukdima