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 4 pull requests #65406

Closed
wants to merge 16 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 14, 2019

Successful merges:

Failed merges:

r? @ghost

oli-obk and others added 16 commits October 2, 2019 10:59
Some places use the local `tcx` variable, some use `self.tcx()`. This
commit removes the local variable so that all places use `self.tcx()`,
for consistency.
This wins 6% on `unicode_normalization`, by avoiding a call to
`lub_concrete_regions()` and a `Region` equality test.
The function only has one call site, so we don't need a tag argument.
And make it more uniform with other macros.
By merging placeholders for future derives' outputs into the derive container's output fragment early.
It means an allocation is required to create an empty `TokenStream`, but
all other operations are simpler and marginally faster due to not having
to check for `None`. Overall it simplifies the code for a negligible
performance effect.

The commit also removes `TokenStream::empty` by implementing `Default`,
which is now possible.
This avoids some unnecessary creation of empty token streams.
…=eddyb

Compute the layout of uninhabited structs

fixes rust-lang#64506

r? @eddyb
…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
…-expansion, r=nikomatsakis

Optimize `LexicalResolve::expansion`.

A win for `unicode_normalization`.

r? @nikomatsakis
…eam, r=petrochenkov

Remove `Option` from `TokenStream`

A code simplification.

r? @petrochenkov
@Centril
Copy link
Contributor Author

Centril commented Oct 14, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Oct 14, 2019

📌 Commit ed9d45b 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 14, 2019
@bors
Copy link
Contributor

bors commented Oct 14, 2019

⌛ Testing commit ed9d45b with merge 23ad56b1c77991fd2274c4fa626c22c9452ba59c...

@bors
Copy link
Contributor

bors commented Oct 14, 2019

💔 Test failed - checks-azure

@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-14T15:32:51.3024642Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-10-14T15:32:51.4016337Z error: Could not document `syntax`.
2019-10-14T15:32:51.4021962Z 
2019-10-14T15:32:51.4022135Z Caused by:
2019-10-14T15:32:51.4035850Z   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-73fb4bb99d847e64.rmeta --extern lazy_static=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/liblazy_static-6f84ad327c3d363c.rmeta --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-f0ab1895b242ebd9.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-8b6bb1a98a903d0a.rmeta --extern errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-8170d64ca7802537.rmeta --extern rustc_index=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_index-6730e724184454d8.rmeta --extern rustc_lexer=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_lexer-76543b2e8774ccac.rmeta --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-3839a06c80e7191c.rmeta --extern scoped_tls=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libscoped_tls-e4f8f14b9619a15f.rmeta --extern rustc_serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-21b4f38cdbc8101b.rmeta --extern smallvec=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libsmallvec-5c82efb247ec812a.rmeta --extern syntax_pos=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax_pos-dffd278961db050f.rmeta --document-private-items --passes strip-hidden` (exit code: 1)
2019-10-14T15:32:58.2573095Z [RUSTC-TIMING] syntax test:false 10.364
2019-10-14T15:32:58.2670955Z error: build failed
2019-10-14T15:32:58.2683286Z 
2019-10-14T15:32:58.2683829Z 
2019-10-14T15:32:58.2683829Z 
2019-10-14T15:32:58.2690546Z 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" "rustc_data_structures" "-p" "rustc_fs_util" "-p" "rustc_incremental" "-p" "rustc_passes" "-p" "rustc_plugin_impl" "-p" "rustc_save_analysis" "-p" "graphviz" "-p" "rustc_target" "-p" "rustc_errors" "-p" "rustc_metadata" "-p" "rustc" "-p" "arena" "-p" "fmt_macros" "-p" "rustc_driver" "-p" "rustc_llvm" "-p" "rustc_plugin" "-p" "rustc_typeck" "-p" "rustc_mir" "-p" "rustc_lint" "-p" "rustc_interface" "-p" "rustc_apfloat" "-p" "syntax" "-p" "rustc_index" "-p" "rustc_codegen_utils" "-p" "serialize" "-p" "rustc_codegen_ssa" "-p" "rustc_traits" "-p" "rustc_codegen_llvm" "-p" "syntax_pos" "-p" "rustc_privacy" "-p" "build_helper" "-p" "rustc_resolve" "-p" "syntax_ext" "-p" "rustc_macros"
2019-10-14T15:32:58.2692516Z 
2019-10-14T15:32:58.2692577Z 
2019-10-14T15:32:58.2703996Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
2019-10-14T15:32:58.2704207Z Build completed unsuccessfully in 1:29:22
2019-10-14T15:32:58.2704207Z Build completed unsuccessfully in 1:29:22
2019-10-14T15:32:58.2762404Z == clock drift check ==
2019-10-14T15:32:58.2786758Z   local time: Mon Oct 14 15:32:58 UTC 2019
2019-10-14T15:32:58.6608050Z   network time: Mon, 14 Oct 2019 15:32:58 GMT
2019-10-14T15:32:58.6611673Z == end clock drift check ==
2019-10-14T15:33:00.1780200Z ##[error]Bash exited with code '1'.
2019-10-14T15:33:00.1829779Z ##[section]Starting: Upload CPU usage statistics
2019-10-14T15:33:00.1861892Z ==============================================================================
2019-10-14T15:33:00.1862167Z Task         : Bash
2019-10-14T15:33:00.1862413Z 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 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 14, 2019
@Centril
Copy link
Contributor Author

Centril commented Oct 14, 2019

I suspect the cause of failure here was #65252.

@Centril Centril closed this Oct 14, 2019
@Centril Centril deleted the rollup-pwwfb94 branch October 14, 2019 16:28
@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.

6 participants