Rollup of 5 pull requests #68360

Dylan-DPC-zz · 2020-01-19T06:00:38Z

Successful merges:

[const-prop] Remove useless typedef #67682 ([const-prop] Remove useless typedef)
Slimmer syntax #68133 (Slimmer syntax)
Add more BTreeMap/BTreeSet benchmarks regarding iteration #68154 (Add more BTreeMap/BTreeSet benchmarks regarding iteration)
Clean up err codes #68247 (Clean up err codes)
Make iter::Empty<T> Send and Sync for any T #68348 (Make iter::Empty Send and Sync for any T)

Failed merges:

Remove rustc_error_codes deps except in rustc_driver #68353 (Remove rustc_error_codes deps except in rustc_driver)

r? @ghost

For now, this is all the crate contains, but more attribute logic & types will be moved there over time.

2. invert rustc_session & syntax deps 3. drop rustc_session dep in rustc_hir

2. as a result, drop rustc_errors dep from syntax

It's confusing because it conflicts with ty::Const and just isn't generally useful.

…ef, r=Dylan-DPC [const-prop] Remove useless typedef It's confusing because it conflicts with `ty::Const` and just isn't generally useful.

Slimmer syntax High-level summary of changes: - The `syntax::node_count` pass is moved into `rustc_ast_passes`. This works towards improving rust-lang#65031 by making compiling `syntax` go faster. - The `syntax::{GLOBALS, with_globals, ..}` business is consolidated into `syntax::attr` for cleaner code and future possible improvements. - The pretty printer loses its dependency on `ParseSess`, opting to use `SourceMap` & friends directly instead. - Some drive by cleanup of `syntax::attr::HasAttr` happens. - Builtin attribute logic (`syntax::attr::builtin`) + `syntax::attr::allow_internal_unstable` is moved into a new `rustc_attr` crate. More logic from `syntax::attr` should be moved into that crate over time. This also means that `syntax` loses all mentions of `ParseSess`, which enables the next point. - The pretty printer `syntax::print` is moved into a new crate `rustc_ast_pretty`. - `rustc_session::node_id` is moved back as `syntax::node_id`. As a result, `syntax` gets to drop dependencies on `rustc_session` (and implicitly `rustc_target`), `rustc_error_codes`, and `rustc_errors`. Moreover `rustc_hir` gets to drop its dependency on `rustc_session` as well. At this point, these crates are mostly "pure data crates", which is approaching a desirable end state. - We should consider renaming `syntax` to `rustc_ast` now.

…, r=Mark-Simulacrum Add more BTreeMap/BTreeSet benchmarks regarding iteration Serving rust-lang#67073 or other developments

@Dylan-DPC

…r=Dylan-DPC Clean up err codes r? @Dylan-DPC

Make iter::Empty<T> Send and Sync for any T Continuing from rust-lang#57682 It's quite funny, when I initially submitted this pull request, I said "Likely nobody will be using that property of `iter::empty`", but then a year later I got a compilation error because it wasn't `Send` and `Sync`. Unfortunately, `PhantomData<fn() -> T>` still errors out. Oh well. I proposed ` struct PhantomFnWorkaround<T>(fn() -> T);`, but dtolnay did not like it, so using explicit implementations.

Dylan-DPC-zz · 2020-01-19T06:05:47Z

@bors r+ rollup=never p=5

bors · 2020-01-19T06:05:48Z

📌 Commit cfc0f54 has been approved by Dylan-DPC

bors · 2020-01-19T08:07:25Z

⌛ Testing commit cfc0f54 with merge 29f163e...

@ghost

Rollup of 5 pull requests Successful merges: - #67682 ([const-prop] Remove useless typedef) - #68133 (Slimmer syntax) - #68154 (Add more BTreeMap/BTreeSet benchmarks regarding iteration) - #68247 (Clean up err codes) - #68348 (Make iter::Empty<T> Send and Sync for any T) Failed merges: - #68353 (Remove `rustc_error_codes` deps except in `rustc_driver`) r? @ghost

rust-highfive · 2020-01-19T09:52:29Z

The job dist-x86_64-linux-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.

2020-01-19T09:50:05.2564511Z  Documenting rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
2020-01-19T09:50:05.2885635Z [RUSTC-TIMING] rustc_feature test:false 9.784
2020-01-19T09:50:05.2886075Z     Checking rustc_session v0.0.0 (/checkout/src/librustc_session)
2020-01-19T09:50:05.3147467Z  Documenting rustc_session v0.0.0 (/checkout/src/librustc_session)
2020-01-19T09:50:07.4288542Z error[E0275]: overflow evaluating the requirement `alloc::raw_vec::RawVec<(syntax::ast::UseTree, syntax::node_id::NodeId)>: std::marker::Sync`
2020-01-19T09:50:07.4289742Z   |
2020-01-19T09:50:07.4290432Z   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
2020-01-19T09:50:07.4291138Z   = note: required because it appears within the type `std::vec::Vec<(syntax::ast::UseTree, syntax::node_id::NodeId)>`
2020-01-19T09:50:07.4291809Z   = note: required because it appears within the type `syntax::ast::UseTreeKind`
2020-01-19T09:50:07.4292501Z   = note: required because it appears within the type `syntax::ast::UseTree`
2020-01-19T09:50:07.4293303Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<syntax::ast::UseTree>`
2020-01-19T09:50:07.4294034Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::UseTree>`
2020-01-19T09:50:07.4294877Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::UseTree>`
2020-01-19T09:50:07.4296757Z   = note: required because it appears within the type `syntax::ast::Item`
2020-01-19T09:50:07.4297541Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<syntax::ast::Item>`
2020-01-19T09:50:07.4298507Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Item>`
2020-01-19T09:50:07.4299334Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Item>`
2020-01-19T09:50:07.4299334Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Item>`
2020-01-19T09:50:07.4300057Z   = note: required because it appears within the type `syntax::token::Nonterminal`
2020-01-19T09:50:07.4301274Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::sync::Arc<syntax::token::Nonterminal>`
2020-01-19T09:50:07.4303162Z   = note: required because it appears within the type `syntax::token::Token`
2020-01-19T09:50:07.4304641Z   = note: required because it appears within the type `syntax::tokenstream::TokenTree`
2020-01-19T09:50:07.4304641Z   = note: required because it appears within the type `syntax::tokenstream::TokenTree`
2020-01-19T09:50:07.4305376Z   = note: required because it appears within the type `(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)`
2020-01-19T09:50:07.4306145Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2020-01-19T09:50:07.4307091Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2020-01-19T09:50:07.4307854Z   = note: required because it appears within the type `std::vec::Vec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2020-01-19T09:50:07.4308664Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::sync::Arc<std::vec::Vec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>>`
2020-01-19T09:50:07.4310029Z   = note: required because it appears within the type `syntax::ast::MacArgs`
2020-01-19T09:50:07.4310029Z   = note: required because it appears within the type `syntax::ast::MacArgs`
2020-01-19T09:50:07.4311590Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::MacArgs>`
2020-01-19T09:50:07.4312457Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::MacArgs>`
2020-01-19T09:50:07.4313126Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::MacArgs>`
2020-01-19T09:50:07.4314229Z   = note: required because it appears within the type `syntax::ast::PatKind`
2020-01-19T09:50:07.4314770Z   = note: required because it appears within the type `syntax::ast::Pat`
2020-01-19T09:50:07.4315349Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Pat>`
2020-01-19T09:50:07.4315923Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Pat>`
---
2020-01-19T09:50:07.4322265Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Ty>`
2020-01-19T09:50:07.4322816Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Ty>`
2020-01-19T09:50:07.4323371Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Ty>`
2020-01-19T09:50:07.4323942Z   = note: required because it appears within the type `syntax::ast::GenericArg`
2020-01-19T09:50:07.4324708Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::GenericArg>`
2020-01-19T09:50:07.4325325Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<syntax::ast::GenericArg>`
2020-01-19T09:50:07.4325917Z   = note: required because it appears within the type `std::vec::Vec<syntax::ast::GenericArg>`
2020-01-19T09:50:07.4326837Z   = note: required because it appears within the type `syntax::ast::AngleBracketedArgs`
2020-01-19T09:50:07.4327968Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::GenericArgs>`
2020-01-19T09:50:07.4328536Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::GenericArgs>`
2020-01-19T09:50:07.4329077Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::GenericArgs>`
2020-01-19T09:50:07.4329746Z   = note: required because it appears within the type `std::option::Option<syntax::ptr::P<syntax::ast::GenericArgs>>`
---
2020-01-19T09:50:12.5868264Z     Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
2020-01-19T09:50:12.6184010Z error: Could not document `rustc_ast_pretty`.
2020-01-19T09:50:12.6190625Z 
2020-01-19T09:50:12.6190787Z Caused by:
2020-01-19T09:50:12.6197739Z   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2018 --crate-type lib --crate-name rustc_ast_pretty src/librustc_ast_pretty/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 --error-format=json --json=diagnostic-rendered-ansi -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 log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-5ff1ff6f0eda1e40.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-f9e34e071a4bbb4e.rmeta --extern rustc_span=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_span-f1f7e817b31b7500.rmeta --extern syntax=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax-24253dc2b90f700b.rmeta --document-private-items` (exit code: 1)
2020-01-19T09:50:12.6281333Z [RUSTC-TIMING] rustc_hir test:false 5.119
2020-01-19T09:50:14.5137349Z warning: `[Body::parameters]` cannot be resolved, ignoring it.
2020-01-19T09:50:14.5137704Z     --> src/librustc_hir/hir.rs:2067:69
2020-01-19T09:50:14.5137987Z      |
---
2020-01-19T09:50:15.2564617Z [RUSTC-TIMING] rustc_parse test:false 2.663
2020-01-19T09:50:15.2742352Z error: build failed
2020-01-19T09:50:15.2770516Z 
2020-01-19T09:50:15.2770595Z 
2020-01-19T09:50:15.2773155Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/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 llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--no-deps" "-p" "rustc_typeck" "-p" "rustc_ast_lowering" "-p" "rustc_error_codes" "-p" "rustc_expand" "-p" "rustc_traits" "-p" "rustc_lexer" "-p" "rustc_ty" "-p" "rustc_feature" "-p" "rustc_resolve" "-p" "rustc_codegen_llvm" "-p" "rustc_metadata" "-p" "rustc_macros" "-p" "rustc_incremental" "-p" "rustc_passes" "-p" "build_helper" "-p" "rustc" "-p" "rustc_fs_util" "-p" "rustc_span" "-p" "syntax" "-p" "rustc_lint" "-p" "rustc_llvm" "-p" "rustc_mir" "-p" "rustc_save_analysis" "-p" "rustc_driver" "-p" "rustc_privacy" "-p" "rustc_builtin_macros" "-p" "rustc_interface" "-p" "rustc_plugin_impl" "-p" "rustc_codegen_utils" "-p" "rustc_apfloat" "-p" "rustc_ast_pretty" "-p" "rustc_session" "-p" "fmt_macros" "-p" "rustc_data_structures" "-p" "rustc_target" "-p" "serialize" "-p" "rustc_ast_passes" "-p" "rustc_hir" "-p" "rustc_errors" "-p" "rustc_parse" "-p" "rustc_index" "-p" "rustc_mir_build" "-p" "arena" "-p" "rustc_attr" "-p" "graphviz" "-p" "rustc_codegen_ssa"
2020-01-19T09:50:15.2777870Z 
2020-01-19T09:50:15.2777908Z 
2020-01-19T09:50:15.2786155Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
2020-01-19T09:50:15.2786303Z Build completed unsuccessfully in 1:35:26
2020-01-19T09:50:15.2786303Z Build completed unsuccessfully in 1:35:26
2020-01-19T09:50:15.2841574Z == clock drift check ==
2020-01-19T09:50:15.2860778Z   local time: Sun Jan 19 09:50:15 UTC 2020
2020-01-19T09:50:15.7450266Z   network time: Sun, 19 Jan 2020 09:50:15 GMT
2020-01-19T09:50:15.7451287Z == end clock drift check ==
2020-01-19T09:50:18.0889943Z 
2020-01-19T09:50:18.0983825Z ##[error]Bash exited with code '1'.
2020-01-19T09:50:18.1023664Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-01-19T09:50:18.1025629Z ==============================================================================
2020-01-19T09:50:18.1025716Z Task         : Get sources
2020-01-19T09:50:18.1025812Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 · 2020-01-19T09:52:44Z

💔 Test failed - checks-azure

ssomers and others added 25 commits January 12, 2020 15:05

Add more BTreeMap/BTreeSet benchmarks regarding iteration

3ada8ae

clean up E0195 explanation

a1a0aea

clean up E0197 explanation

6f1bdb4

{syntax -> rustc_ast_passes}::node_count

9b4823d

syntax: move GLOBALS to attr module

dc457c6

pretty: remove ParseSess dependency

c124e32

syntax: simplify HasAttrs code

d9bbebc

Move builtin attribute logic to new rustc_attr crate.

a7f6cc7

For now, this is all the crate contains, but more attribute logic & types will be moved there over time.

1. move node_id to syntax

6164f5c

2. invert rustc_session & syntax deps 3. drop rustc_session dep in rustc_hir

1. move allow_internal_unstable to rustc_attr

6a6f419

2. as a result, drop rustc_errors dep from syntax

syntax::print -> new crate rustc_ast_pretty

e68df02

pacify the parallel compiler

1187ccd

remove rustc_ast_pretty dep from rustc

279e214

Make iter::Empty<T> implement Send and Sync for any T

a70b240

Add a test for iter::empty::<*mut i32> being Sync and Send

d7a18f8

syntax: reexport attr globals

e7a7964

pretty: injected_crate_name -> has_injected_crate

5aaf0be

fix fallout in tests

a67d36f

[const-prop] Remove useless typedef

e1f70f7

It's confusing because it conflicts with ty::Const and just isn't generally useful.

[const-prop] Run x.py fmt

a957f0d

Rollup merge of rust-lang#67682 - wesleywiser:remove_opty_const_typed…

1d25bd2

…ef, r=Dylan-DPC [const-prop] Remove useless typedef It's confusing because it conflicts with `ty::Const` and just isn't generally useful.

Rollup merge of rust-lang#68154 - ssomers:btreemap_navigation_benches…

f78b3e4

…, r=Mark-Simulacrum Add more BTreeMap/BTreeSet benchmarks regarding iteration Serving rust-lang#67073 or other developments

Rollup merge of rust-lang#68247 - GuillaumeGomez:clean-up-err-codes, …

013f253

…r=Dylan-DPC Clean up err codes r? @Dylan-DPC

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 19, 2020

Dylan-DPC-zz added the rollup A PR which is a rollup label Jan 19, 2020

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 Jan 19, 2020

Dylan-DPC-zz closed this Jan 20, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #68360

Rollup of 5 pull requests #68360

Dylan-DPC-zz commented Jan 19, 2020

Dylan-DPC-zz commented Jan 19, 2020

bors commented Jan 19, 2020

bors commented Jan 19, 2020

rust-highfive commented Jan 19, 2020

bors commented Jan 19, 2020

Rollup of 5 pull requests #68360

Rollup of 5 pull requests #68360

Conversation

Dylan-DPC-zz commented Jan 19, 2020

Dylan-DPC-zz commented Jan 19, 2020

bors commented Jan 19, 2020

bors commented Jan 19, 2020

rust-highfive commented Jan 19, 2020

bors commented Jan 19, 2020