Rollup of 5 pull requests by Centril · Pull Request #65053 · rust-lang/rust

Centril · 2019-10-03T09:21:31Z

Successful merges:

proc_macro API: Expose macro_rules hygiene #64690 (proc_macro API: Expose macro_rules hygiene)
Fix most remaining Polonius test differences #64749 (Fix most remaining Polonius test differences)
Avoid ICE on ReFree region on where clause #64938 (Avoid ICE on ReFree region on where clause)
extract expected return type for async fn generators #64999 (extract expected return type for async fn generators)
#[track_caller] feature gate (RFC 2091 1/N) #65037 (#[track_caller] feature gate (RFC 2091))

Failed merges:

This fixes some test differences and also avoids overflow in issue-38591.rs.

- The attribute is behind a feature gate. - Error if both #[naked] and #[track_caller] are applied to the same function. - Error if #[track_caller] is applied to a non-function item. - Error if ABI is not "rust" - Error if #[track_caller] is applied to a trait function. Error codes and descriptions are pending.

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

@dtolnay

proc_macro API: Expose `macro_rules` hygiene Proc macros do not have direct access to our oldest and most stable hygiene kind - `macro_rules` hygiene. To emulate it macro authors have to go through two steps - first generate a temporary `macro_rules` item (using a derive, at least until rust-lang#64035 is merged), then generate a macro call to that item. Popular crates like [proc_macro_hack](https://crates.io/crates/proc-macro-hack) use this trick to generate hygienic identifiers from proc macros. I'd say that these workarounds with nested macro definitions have more chances to hit some corner cases in our hygiene system, in which we don't have full confidence. So, let's provide a direct access to `macro_rules` hygiene instead. This PR does that by adding a new method `Span::mixed_site` (bikeshedding is welcome) in addition to existing `Span::call_site` (stable) and `Span::def_site` (unstable). Identifiers with this span resolve at def-site in for local variables, labels and `$crate`, and resolve at call-site for everything else, i.e. exactly like identifiers produced by `macro_rules`. This API addition opens the way to stabilizing proc macros in expression positions (rust-lang#54727), for which use of call-site hygiene or workarounds with temporary items would be quite unfortunate. (`macro_rules` expanded in expression position, on the other hand, are stable since 1.0 and widely used.) r? @dtolnay @alexcrichton

@nikomatsakis

…atsakis Fix most remaining Polonius test differences This fixes most of the Polonius test differences and also avoids overflow in issue-38591.rs. r? @nikomatsakis

Avoid ICE on ReFree region on where clause Fix rust-lang#64855.

@Centril

…rn-inference, r=cramertj extract expected return type for async fn generators Fixes rust-lang#60424 cc @Centril, I know you've been eager to see this fixed. r? @cramertj

@ayosec

`#[track_caller]` feature gate (RFC 2091) RFC text: https://github.com/rust-lang/rfcs/blob/master/text/2091-inline-semantic.md Tracking issue: rust-lang#47809 I started with @ayosec's commit to add the feature gate with tests and rebased it onto current master. I fixed up some tidy lints and added a test.

Centril · 2019-10-03T09:21:43Z

@bors r+ p=5 rollup=never

bors · 2019-10-03T09:21:45Z

📌 Commit 18ce550 has been approved by Centril

bors · 2019-10-03T09:58:04Z

⌛ Testing commit 18ce550 with merge c049e10...

@ghost

Rollup of 5 pull requests Successful merges: - #64690 (proc_macro API: Expose `macro_rules` hygiene) - #64749 (Fix most remaining Polonius test differences) - #64938 (Avoid ICE on ReFree region on where clause) - #64999 (extract expected return type for async fn generators) - #65037 (`#[track_caller]` feature gate (RFC 2091)) Failed merges: r? @ghost

rust-highfive · 2019-10-03T12:04:50Z

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.

2019-10-03T12:01:32.4661621Z warning: the 'passes' flag is considered deprecated
2019-10-03T12:01:32.4662016Z   |
2019-10-03T12:01:32.4662385Z   = warning: please see https://github.com/rust-lang/rust/issues/44136
2019-10-03T12:01:32.4662486Z 
2019-10-03T12:01:33.3690675Z error[E0275]: overflow evaluating the requirement `alloc::raw_vec::RawVec<(syntax::ast::UseTree, syntax::ast::node_id_inner::NodeId)>: std::marker::Sync`
2019-10-03T12:01:33.3691462Z   |
2019-10-03T12:01:33.3691964Z   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
2019-10-03T12:01:33.3692470Z   = note: required because it appears within the type `std::vec::Vec<(syntax::ast::UseTree, syntax::ast::node_id_inner::NodeId)>`
2019-10-03T12:01:33.3693138Z   = note: required because it appears within the type `syntax::ast::UseTreeKind`
2019-10-03T12:01:33.3693518Z   = note: required because it appears within the type `syntax::ast::UseTree`
2019-10-03T12:01:33.3693988Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<syntax::ast::UseTree>`
2019-10-03T12:01:33.3694653Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::UseTree>`
2019-10-03T12:01:33.3695045Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::UseTree>`
2019-10-03T12:01:33.3695527Z   = note: required because it appears within the type `syntax::ast::ItemKind`
2019-10-03T12:01:33.3696196Z   = note: required because it appears within the type `syntax::ast::Item`
2019-10-03T12:01:33.3696647Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<syntax::ast::Item>`
2019-10-03T12:01:33.3697065Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Item>`
2019-10-03T12:01:33.3697467Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Item>`
2019-10-03T12:01:33.3697874Z   = note: required because it appears within the type `syntax::parse::token::Nonterminal`
2019-10-03T12:01:33.3698345Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::sync::Arc<syntax::parse::token::Nonterminal>`
2019-10-03T12:01:33.3698762Z   = note: required because it appears within the type `syntax::parse::token::TokenKind`
2019-10-03T12:01:33.3699161Z   = note: required because it appears within the type `syntax::parse::token::Token`
2019-10-03T12:01:33.3699988Z   = note: required because it appears within the type `syntax::tokenstream::TokenTree`
2019-10-03T12:01:33.3700470Z   = note: required because it appears within the type `(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)`
2019-10-03T12:01:33.3700986Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2019-10-03T12:01:33.3701479Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2019-10-03T12:01:33.3701962Z   = note: required because it appears within the type `std::vec::Vec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2019-10-03T12:01:33.3702625Z   = 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)>>`
2019-10-03T12:01:33.3703230Z   = note: required because it appears within the type `std::option::Option<std::sync::Arc<std::vec::Vec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>>>`
2019-10-03T12:01:33.3703661Z   = note: required because it appears within the type `syntax::tokenstream::TokenStream`
2019-10-03T12:01:33.3704070Z   = note: required because it appears within the type `syntax::ast::Mac`
2019-10-03T12:01:33.3712783Z   = note: required because it appears within the type `syntax::ast::PatKind`
2019-10-03T12:01:33.3721794Z   = note: required because it appears within the type `syntax::ast::Pat`
2019-10-03T12:01:33.3729774Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Pat>`
2019-10-03T12:01:33.3740713Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Pat>`
2019-10-03T12:01:33.3741175Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Pat>`
2019-10-03T12:01:33.3741835Z   = note: required because it appears within the type `syntax::ast::ExprKind`
2019-10-03T12:01:33.3742233Z   = note: required because it appears within the type `syntax::ast::Expr`
2019-10-03T12:01:33.3742663Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Expr>`
2019-10-03T12:01:33.3743102Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Expr>`
2019-10-03T12:01:33.3743519Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Expr>`
2019-10-03T12:01:33.3743899Z   = note: required because it appears within the type `syntax::ast::AnonConst`
2019-10-03T12:01:33.3744301Z   = note: required because it appears within the type `syntax::ast::TyKind`
2019-10-03T12:01:33.3744682Z   = note: required because it appears within the type `syntax::ast::Ty`
2019-10-03T12:01:33.3745212Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Ty>`
2019-10-03T12:01:33.3745623Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Ty>`
2019-10-03T12:01:33.3745999Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Ty>`
2019-10-03T12:01:33.3746391Z   = note: required because it appears within the type `syntax::ast::GenericArg`
2019-10-03T12:01:33.3746835Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::GenericArg>`
2019-10-03T12:01:33.3747245Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<syntax::ast::GenericArg>`
2019-10-03T12:01:33.3747765Z   = note: required because it appears within the type `std::vec::Vec<syntax::ast::GenericArg>`
2019-10-03T12:01:33.3748278Z   = note: required because it appears within the type `syntax::ast::AngleBracketedArgs`
2019-10-03T12:01:33.3748717Z   = note: required because it appears within the type `syntax::ast::GenericArgs`
2019-10-03T12:01:33.3749266Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::GenericArgs>`
2019-10-03T12:01:33.3750653Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::GenericArgs>`
2019-10-03T12:01:33.3751119Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::GenericArgs>`
2019-10-03T12:01:33.3751579Z   = note: required because it appears within the type `std::option::Option<syntax::ptr::P<syntax::ast::GenericArgs>>`
2019-10-03T12:01:33.3751993Z   = note: required because it appears within the type `syntax::ast::PathSegment`
2019-10-03T12:01:33.3752455Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::PathSegment>`
2019-10-03T12:01:33.3753172Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<syntax::ast::PathSegment>`
2019-10-03T12:01:33.3753587Z   = note: required because it appears within the type `std::vec::Vec<syntax::ast::PathSegment>`
2019-10-03T12:01:33.3753987Z   = note: required because it appears within the type `syntax::ast::Path`
2019-10-03T12:01:33.3754491Z   = note: required because it appears within the type `syntax::ast::AttrItem`
2019-10-03T12:01:33.3755089Z   = note: required because it appears within the type `syntax::ast::Attribute`
2019-10-03T12:01:33.3755522Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Attribute>`
2019-10-03T12:01:33.3755951Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<syntax::ast::Attribute>`
2019-10-03T12:01:33.3756336Z   = note: required because it appears within the type `std::vec::Vec<syntax::ast::Attribute>`
2019-10-03T12:01:33.3977163Z error: aborting due to previous error
2019-10-03T12:01:33.3983789Z 
2019-10-03T12:01:33.3992283Z For more information about this error, try `rustc --explain E0275`.
2019-10-03T12:01:34.8941584Z warning: `[E0502]` cannot be resolved, ignoring it...
---
2019-10-03T12:01:56.4918691Z [RUSTC-TIMING] rustc_plugin test:false 29.946
2019-10-03T12:02:01.5924569Z error: Could not document `rustc_plugin`.
2019-10-03T12:02:01.5924954Z 
2019-10-03T12:02:01.5925066Z Caused by:
2019-10-03T12:02:01.5926265Z   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2018 --crate-type lib --crate-name rustc_plugin src/librustc_plugin/deprecated/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 rustc_plugin_impl=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_plugin_impl-65720c0d80ea00a8.rmeta --document-private-items --passes strip-hidden` (exit code: 1)
2019-10-03T12:02:06.9648275Z [RUSTC-TIMING] rustc_codegen_ssa test:false 46.170
2019-10-03T12:02:06.9822278Z error: build failed
2019-10-03T12:02:06.9853954Z 
2019-10-03T12:02:06.9856170Z 
2019-10-03T12:02:06.9856170Z 
2019-10-03T12:02:06.9858460Z 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_errors" "-p" "rustc_privacy" "-p" "rustc_save_analysis" "-p" "rustc_plugin" "-p" "rustc_codegen_utils" "-p" "rustc_interface" "-p" "rustc_typeck" "-p" "rustc_resolve" "-p" "build_helper" "-p" "syntax_ext" "-p" "rustc_lexer" "-p" "rustc_traits" "-p" "rustc_llvm" "-p" "rustc_codegen_ssa" "-p" "rustc_lint" "-p" "rustc_metadata" "-p" "rustc_mir" "-p" "rustc_target" "-p" "arena" "-p" "rustc" "-p" "fmt_macros" "-p" "rustc_driver" "-p" "syntax_pos" "-p" "rustc_data_structures" "-p" "rustc_macros" "-p" "syntax" "-p" "rustc_plugin_impl" "-p" "rustc_index" "-p" "rustc_apfloat" "-p" "rustc_passes" "-p" "rustc_incremental" "-p" "rustc_fs_util" "-p" "rustc_codegen_llvm" "-p" "serialize" "-p" "graphviz"
2019-10-03T12:02:06.9859585Z 
2019-10-03T12:02:06.9859829Z 
2019-10-03T12:02:06.9868982Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
2019-10-03T12:02:06.9869791Z Build completed unsuccessfully in 1:54:57
2019-10-03T12:02:06.9869791Z Build completed unsuccessfully in 1:54:57
2019-10-03T12:02:06.9931269Z == clock drift check ==
2019-10-03T12:02:06.9951448Z   local time: Thu Oct  3 12:02:06 UTC 2019
2019-10-03T12:02:07.3595199Z   network time: Thu, 03 Oct 2019 12:02:07 GMT
2019-10-03T12:02:07.3596120Z == end clock drift check ==
2019-10-03T12:02:10.8796187Z ##[error]Bash exited with code '1'.
2019-10-03T12:02:10.8844629Z ##[section]Starting: Upload CPU usage statistics
2019-10-03T12:02:10.8863114Z ==============================================================================
2019-10-03T12:02:10.8863233Z Task         : Bash
2019-10-03T12:02:10.8863334Z 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-10-03T12:05:04Z

💔 Test failed - checks-azure

nikomatsakis and others added 30 commits October 2, 2019 10:03

track the kind of async generator we are creating

c845f3d

thread down the body so we can check if this is an async fn body

44e801a

improved debug output

c8e5851

extract expected return type from -> impl Future obligation

f7ed53c

WIP tidy hir/lowering/expr.rs

094f3a8

WIP rebase for shallow_resolve call

81cd596

WIP fix tests

dce20bf

correct coercion comments

3ae4abb

improve comments on GeneratorKind and AsyncGeneratorKind

a999132

document ret_coercion and ret_coercion_span

5d64b3d

document shallow_resolve

5fea1d2

s/async fn/async fn/

3f277e1

Avoid ICE on ReFree region from malformed code

a5cfc40

avoid using skip_binder and instead look for bound vars properly

a96bce7

Calculate liveness for the same locals with and without -Zpolonius

08a60ac

This fixes some test differences and also avoids overflow in issue-38591.rs.

Make lifetimes in constants live at the point of use

2180c24

add unsize slice-str coercion

4a49351

fix example (le sigh)

19c07cc

review comments

de81565

track_caller run-pass test, lint cleanup, PR review.

e9deff0

track_caller feature gate starts in 1.40.0.

1e78d99

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Mark #![feature(track_caller)] as incomplete.

da86007

track_caller error numbers and text.

8ac9104

track_caller tests account for incomplete feature warning.

9e301d1

./x.py test --bless --compare-mode=nll

a807032

proc_macro: Add Span::mixed_site exposing macro_rules hygiene

d1310dc

Rollup merge of rust-lang#64749 - matthewjasper:liveness-opt, r=nikom…

1172cd4

…atsakis Fix most remaining Polonius test differences This fixes most of the Polonius test differences and also avoids overflow in issue-38591.rs. r? @nikomatsakis

Rollup merge of rust-lang#64938 - estebank:ice-ice-baby, r=matthewjasper

f22cd77

Avoid ICE on ReFree region on where clause Fix rust-lang#64855.

Centril added 2 commits October 3, 2019 11:21

Rollup merge of rust-lang#64999 - nikomatsakis:issue-60424-async-retu…

83adae8

…rn-inference, r=cramertj extract expected return type for async fn generators Fixes rust-lang#60424 cc @Centril, I know you've been eager to see this fixed. r? @cramertj

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 3, 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 Oct 3, 2019

This was referenced Oct 3, 2019

extract expected return type for async fn generators #64999

Merged

Avoid ICE on ReFree region on where clause #64938

Merged

proc_macro API: Expose macro_rules hygiene #64690

Merged

Centril closed this Oct 3, 2019

Centril deleted the rollup-nwp0wgf branch October 3, 2019 12:21

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 5 pull requests#65053

Rollup of 5 pull requests#65053
Centril wants to merge 32 commits intorust-lang:masterfrom
Centril:rollup-nwp0wgf

Centril commented Oct 3, 2019

Uh oh!

Centril commented Oct 3, 2019

Uh oh!

bors commented Oct 3, 2019

Uh oh!

bors commented Oct 3, 2019

Uh oh!

rust-highfive commented Oct 3, 2019

Uh oh!

bors commented Oct 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

Centril commented Oct 3, 2019

Uh oh!

Centril commented Oct 3, 2019

Uh oh!

bors commented Oct 3, 2019

Uh oh!

bors commented Oct 3, 2019

Uh oh!

rust-highfive commented Oct 3, 2019

Uh oh!

bors commented Oct 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants