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 12 pull requests #65382

Closed
wants to merge 33 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 13, 2019

Successful merges:

Failed merges:

r? @ghost

Amanieu and others added 30 commits October 8, 2019 20:34
And make it more uniform with other macros.
By merging placeholders for future derives' outputs into the derive container's output fragment early.
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
…hewjasper

expand: Simplify expansion of derives

And make it more uniform with other macros.
This is done by merging placeholders for future derives' outputs into the derive container's output fragment early (addressing FIXMEs from rust-lang#63667).

Also, macros with names starting with `_` are no longer reported as unused, in accordance with the usual behavior of `unused` lints.

r? @matthewjasper or @mark-i-m
improve performance of signed saturating_mul

Reciprocal throughput is improved from 2.3 to 1.7. https://godbolt.org/z/ROMiX6

Fixes rust-lang#65309.
Fix typo in task::Waker

fixes  rust-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.
syntax: consolidate function parsing in item.rs

Extracted from rust-lang#65324.

r? @estebank
…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
Contributor Author

Centril commented Oct 13, 2019

@bors r+ p=12 rollup=never

@bors
Copy link
Contributor

bors commented Oct 13, 2019

📌 Commit 813d4c3 has been approved by Centril

@bors bors 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
Copy link
Contributor

bors commented Oct 13, 2019

⌛ Testing commit 813d4c3 with merge 2842d4a596de925e93b53dbb5356b89e37e0256a...

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-linux 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.
2019-10-13T17:10:06.8108568Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-10-13T17:10:06.9097198Z error: Could not document `syntax`.
2019-10-13T17:10:06.9099670Z 
2019-10-13T17:10:06.9101222Z Caused by:
2019-10-13T17:10:06.9107408Z   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2018 --crate-type lib --crate-name syntax src/libsyntax/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/doc --color always -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/release/deps --extern bitflags=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libbitflags-435dbeebdef092cb.rmeta --extern lazy_static=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/liblazy_static-a6b66cd822ecd2b7.rmeta --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-10998367f7a2cdfc.rmeta --extern rustc_data_structures=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_data_structures-f2a014a0db031991.rmeta --extern errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-b3159432e1221100.rmeta --extern rustc_index=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_index-71dcfe9e43d142fc.rmeta --extern rustc_lexer=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_lexer-0c2de7c77980d275.rmeta --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-a83e0850fdaf203d.rmeta --extern scoped_tls=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libscoped_tls-39457f4bb57354dd.rmeta --extern rustc_serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-2acc33d0854bc403.rmeta --extern smallvec=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libsmallvec-bb804521efc09831.rmeta --extern syntax_pos=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax_pos-841e94e5e9965c08.rmeta --document-private-items --passes strip-hidden` (exit code: 1)
2019-10-13T17:10:13.2559711Z [RUSTC-TIMING] syntax test:false 11.438
2019-10-13T17:10:13.2676044Z error: build failed
2019-10-13T17:10:13.2694814Z 
2019-10-13T17:10:13.2695203Z 
2019-10-13T17:10:13.2695203Z 
2019-10-13T17:10:13.2701894Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "doc" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--features" "jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--no-deps" "-p" "rustc_lexer" "-p" "syntax" "-p" "rustc_driver" "-p" "rustc_traits" "-p" "rustc_lint" "-p" "rustc_target" "-p" "fmt_macros" "-p" "rustc_incremental" "-p" "rustc_llvm" "-p" "rustc_mir" "-p" "rustc_plugin_impl" "-p" "serialize" "-p" "rustc_errors" "-p" "rustc_privacy" "-p" "syntax_ext" "-p" "rustc_codegen_llvm" "-p" "rustc_macros" "-p" "graphviz" "-p" "rustc_apfloat" "-p" "rustc" "-p" "rustc_fs_util" "-p" "rustc_plugin" "-p" "rustc_codegen_ssa" "-p" "syntax_pos" "-p" "rustc_save_analysis" "-p" "rustc_typeck" "-p" "rustc_index" "-p" "arena" "-p" "rustc_resolve" "-p" "build_helper" "-p" "rustc_metadata" "-p" "rustc_data_structures" "-p" "rustc_passes" "-p" "rustc_codegen_utils" "-p" "rustc_interface"
2019-10-13T17:10:13.2702498Z 
2019-10-13T17:10:13.2702558Z 
2019-10-13T17:10:13.2718699Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
2019-10-13T17:10:13.2719426Z Build completed unsuccessfully in 1:40:36
2019-10-13T17:10:13.2719426Z Build completed unsuccessfully in 1:40:36
2019-10-13T17:10:13.2783102Z == clock drift check ==
2019-10-13T17:10:13.2809722Z   local time: Sun Oct 13 17:10:13 UTC 2019
2019-10-13T17:10:13.5785122Z   network time: Sun, 13 Oct 2019 17:10:13 GMT
2019-10-13T17:10:13.5785280Z == end clock drift check ==
2019-10-13T17:10:15.2194179Z ##[error]Bash exited with code '1'.
2019-10-13T17:10:15.2248925Z ##[section]Starting: Upload CPU usage statistics
2019-10-13T17:10:15.2262673Z ==============================================================================
2019-10-13T17:10:15.2263026Z Task         : Bash
2019-10-13T17:10:15.2263218Z Description  : Run a Bash script on macOS, Linux, or Windows

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)

@bors
Copy link
Contributor

bors commented Oct 13, 2019

💔 Test failed - checks-azure

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

Centril commented Oct 13, 2019

That's an odd failure...

@Centril Centril closed this Oct 13, 2019
@Centril Centril deleted the rollup-jc14sl3 branch October 13, 2019 17:19
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet