Rollup of 4 pull requests#64567

tmandry · 2019-09-18T02:17:51Z

Successful merges:

Print out more information for -Zunpretty=expanded,hygiene #64486 (Print out more information for -Zunpretty=expanded,hygiene)
update Nomicon and Reference #64516 (update Nomicon and Reference)
Load proc macro metadata in the correct order. #64528 (Load proc macro metadata in the correct order.)
Update Cargo #64536 (Update Cargo)

Failed merges:

This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

This ensures that we match the order used by proc macro metadata serialization. Fixes rust-lang#64251

…petrochenkov Print out more information for `-Zunpretty=expanded,hygiene` I've found this helpful when trying to understand how hygiene works. Closes rust-lang#16420

@Centril

update Nomicon and Reference Cc @Centril

…excrichton Load proc macro metadata in the correct order. Serialized proc macro metadata is assumed to have a one-to-one correspondence with the entries in static array generated by proc_macro_harness. However, we were previously serializing proc macro metadata in a different order than proc macros were laied out in the static array. This lead to us associating the wrong data with a proc macro when generating documentation, causing Rustdoc to generate incorrect docs for proc macros. This commit keeps track of the order in which we insert proc macros into the generated static array. We use this same order when serializing proc macro metadata, ensuring that we can later associate the metadata for a proc macro with its entry in the static array. Fixes rust-lang#64251

Update Cargo This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

tmandry · 2019-09-18T02:18:11Z

@bors r+ p=4

bors · 2019-09-18T02:18:13Z

📌 Commit 4d94422 has been approved by tmandry

bors · 2019-09-18T02:19:04Z

⌛ Testing commit 4d94422 with merge 9c227d1e30c7a213ce2da303184f4855772ecdeb...

rust-highfive · 2019-09-18T03:48:59Z

The job dist-x86_64-apple-alt 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-09-18T03:47:33.0639540Z [RUSTC-TIMING] cargo test:false 184.425
2019-09-18T03:47:50.1505190Z [RUSTC-TIMING] rls test:false 179.841
2019-09-18T03:47:53.4857240Z [RUSTC-TIMING] rls test:false 3.273
2019-09-18T03:47:53.5328340Z     Finished release [optimized] target(s) in 5m 01s
2019-09-18T03:47:53.5894810Z duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
2019-09-18T03:47:53.5895270Z 
2019-09-18T03:47:53.5895830Z the following dependencies are duplicated although they have the same features enabled:
2019-09-18T03:47:53.5896200Z the following dependencies have different features:
2019-09-18T03:47:53.5897380Z   tar 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)
2019-09-18T03:47:53.5898310Z     `rls` additionally enabled features {} at "/Users/vsts/agent/2.155.1/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libtar-9b87067b769484f5.rlib"
2019-09-18T03:47:53.5899210Z     `cargo` additionally enabled features {"default", "xattr"} at "/Users/vsts/agent/2.155.1/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libtar-1b9488c5c76ec99f.rlib"
2019-09-18T03:47:53.5899360Z 
2019-09-18T03:47:53.5900760Z to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
2019-09-18T03:47:53.5901630Z thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:198:13
2019-09-18T03:47:53.6019080Z failed to run: /Users/vsts/agent/2.155.1/work/1/s/build/bootstrap/debug/bootstrap dist
2019-09-18T03:47:53.6019620Z Build completed unsuccessfully in 1:22:59
2019-09-18T03:47:53.6093610Z == clock drift check ==
2019-09-18T03:47:53.6140600Z   local time: Wed Sep 18 03:47:53 UTC 2019
2019-09-18T03:47:53.6140600Z   local time: Wed Sep 18 03:47:53 UTC 2019
2019-09-18T03:47:53.7174280Z   network time: Wed, 18 Sep 2019 03:47:53 GMT
2019-09-18T03:47:53.7177340Z == end clock drift check ==
2019-09-18T03:47:53.7405440Z ##[error]Bash exited with code '1'.
2019-09-18T03:47:53.7517380Z ##[section]Starting: Upload CPU usage statistics
2019-09-18T03:47:53.7524810Z ==============================================================================
2019-09-18T03:47:53.7524980Z Task         : Bash
2019-09-18T03:47:53.7525120Z 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 · 2019-09-18T03:49:23Z

💔 Test failed - checks-azure

tmandry · 2019-09-18T04:31:50Z

Closing in favor of #64570
@bors r-

matthewjasper and others added 9 commits September 15, 2019 10:22

Print visibility of macro items

b4ef99f

Update Cargo

7419050

This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

Print syntax contexts and marks when printing hygiene information

3c2fd1a

update Nomicon and Reference

ebd129b

Generate proc macro harness in AST order.

3daa8bd

This ensures that we match the order used by proc macro metadata serialization. Fixes rust-lang#64251

Rollup merge of rust-lang#64486 - matthewjasper:hygiene-debugging, r=…

48e2308

…petrochenkov Print out more information for `-Zunpretty=expanded,hygiene` I've found this helpful when trying to understand how hygiene works. Closes rust-lang#16420

Rollup merge of rust-lang#64516 - RalfJung:nomicon, r=Centril

5fa6674

update Nomicon and Reference Cc @Centril

Rollup merge of rust-lang#64536 - Aaron1011:cargo-crate-type, r=ehuss

4d94422

Update Cargo This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 18, 2019

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 Sep 18, 2019

tmandry mentioned this pull request Sep 18, 2019

Update Cargo #64536

Merged

tmandry closed this Sep 18, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 18, 2019

tmandry deleted the rollup-8989emf branch September 18, 2019 04:31

tmandry restored the rollup-8989emf branch September 18, 2019 04:32

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 4 pull requests#64567