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 7 pull requests #70053

Closed
wants to merge 17 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 16, 2020

Successful merges:

Failed merges:

r? @ghost

petrochenkov and others added 17 commits March 9, 2020 20:50
expand: Implement something similar to `#[cfg(accessible(path))]`

cc rust-lang#64797

The feature is implemented as a `#[cfg_accessible(path)]` attribute macro rather than as `#[cfg(accessible(path))]` because it needs to wait until `path` becomes resolvable, and `cfg` cannot wait, but macros can wait.

Later we can think about desugaring or not desugaring `#[cfg(accessible(path))]` into `#[cfg_accessible(path)]`.

This implementation is also incomplete in the sense that it never returns "false" from `cfg_accessible(path)`, it requires some tweaks to resolve, which is not quite ready to answer queries like this during early resolution.

However, the most important part of this PR is not `cfg_accessible` itself, but expansion infrastructure for retrying expansions.
Before this PR we could say "we cannot resolve this macro path, let's try it later", with this PR we can say "we cannot expand this macro, let's try it later" as well.

This is a pre-requisite for
- turning `#[derive(...)]` into a regular attribute macro,
- properly supporting eager expansion for macros that cannot yet be resolved like
    ```
    fn main() {
        println!(not_available_yet!());
    }

    macro_rules! make_available {
        () => { #[macro_export] macro_rules! not_available_yet { () => { "Hello world!" } }}
    }

    make_available!();
    ```
VariantSizeDifferences: bail on SizeOverflow

Fixes rust-lang#69485.

r? @oli-obk
resolve: Fix regression in resolution of raw keywords in paths

Fixes rust-lang#63882.
Use sublice patterns to avoid computing the len

r? @Centril
…unimplemented, r=eddyb

Fiddle `ParamEnv` through to a place that used to use `ParamEnv::empty` in a buggy manner

cc rust-lang#69981 (comment)

r? @eddyb
@Centril
Copy link
Contributor Author

Centril commented Mar 16, 2020

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Mar 16, 2020

📌 Commit 9d325cf 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 Mar 16, 2020
@Centril Centril added the rollup A PR which is a rollup label Mar 16, 2020
@bors
Copy link
Contributor

bors commented Mar 16, 2020

⌛ Testing commit 9d325cf with merge b9fa22199c2a75e48c17f5d5cbbd04b3d52af2d7...

@rust-highfive
Copy link
Collaborator

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

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 @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Mar 16, 2020

💔 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 Mar 16, 2020
@Dylan-DPC-zz
Copy link

@bors retry

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

bors commented Mar 16, 2020

⌛ Testing commit 9d325cf with merge 4a5b913...

bors added a commit that referenced this pull request Mar 16, 2020
Rollup of 7 pull requests

Successful merges:

 - #69870 (expand: Implement something similar to `#[cfg(accessible(path))]`)
 - #69881 (VariantSizeDifferences: bail on SizeOverflow)
 - #70000 (resolve: Fix regression in resolution of raw keywords in paths)
 - #70029 (Bump the bootstrap compiler)
 - #70046 (Use sublice patterns to avoid computing the len)
 - #70049 (Fiddle `ParamEnv` through to a place that used to use `ParamEnv::empty` in a buggy manner)
 - #70051 (Allow `hir().find` to return `None`)

Failed merges:

r? @ghost
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 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-03-16T19:18:08.0904859Z ========================== Starting Command Output ===========================
2020-03-16T19:18:08.0907602Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/71302b6d-ef9e-40fa-8824-bd9fbf7a1bd8.sh
2020-03-16T19:18:08.0907864Z 
2020-03-16T19:18:08.0911418Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-16T19:18:08.0930056Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70053/merge to s
2020-03-16T19:18:08.0933305Z Task         : Get sources
2020-03-16T19:18:08.0933725Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-16T19:18:08.0934020Z Version      : 1.0.0
2020-03-16T19:18:08.0934210Z Author       : Microsoft
---
2020-03-16T19:18:09.3431025Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-16T19:18:09.3437474Z ##[command]git config gc.auto 0
2020-03-16T19:18:09.3443821Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-16T19:18:09.3448404Z ##[command]git config --get-all http.proxy
2020-03-16T19:18:09.3456886Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70053/merge:refs/remotes/pull/70053/merge
---
2020-03-16T20:13:30.9473437Z .................................................................................................... 1700/9781
2020-03-16T20:13:35.1029065Z .................................................................................................... 1800/9781
2020-03-16T20:13:45.9458468Z ..........................................................................i......................... 1900/9781
2020-03-16T20:13:52.0166243Z .................................................................................................... 2000/9781
2020-03-16T20:13:59.6918926Z ................................................................iiiii............................... 2100/9781
2020-03-16T20:14:16.5186648Z .................................................................................................... 2300/9781
2020-03-16T20:14:18.6644373Z .................................................................................................... 2400/9781
2020-03-16T20:14:21.3975300Z .................................................................................................... 2500/9781
2020-03-16T20:14:40.9616293Z .................................................................................................... 2600/9781
---
2020-03-16T20:17:15.9021133Z ....................................i...............i............................................... 5000/9781
2020-03-16T20:17:25.1274353Z .................................................................................................... 5100/9781
2020-03-16T20:17:31.0970119Z ...............................................................................i.................... 5200/9781
2020-03-16T20:17:36.4866247Z ..................................................................F................................. 5300/9781
2020-03-16T20:17:46.1732446Z .............................................................ii.ii........i...i..................... 5400/9781
2020-03-16T20:17:53.9503999Z i................................................................................................... 5600/9781
2020-03-16T20:18:03.1200944Z .................................................................................................... 5700/9781
2020-03-16T20:18:09.1649931Z ......................................................i............................................. 5800/9781
2020-03-16T20:18:15.4597324Z .................................................................................................... 5900/9781
2020-03-16T20:18:15.4597324Z .................................................................................................... 5900/9781
2020-03-16T20:18:24.3312269Z .................................................................................................... 6000/9781
2020-03-16T20:18:30.9229533Z ................................................ii...i..ii...........i.............................. 6100/9781
2020-03-16T20:18:50.6390913Z .................................................................................................... 6300/9781
2020-03-16T20:18:55.0360622Z .................................................................................................... 6400/9781
2020-03-16T20:18:55.0360622Z .................................................................................................... 6400/9781
2020-03-16T20:18:59.1912741Z ..............................................................................i..ii................. 6500/9781
2020-03-16T20:19:20.4304378Z .................................................................................................... 6700/9781
2020-03-16T20:19:29.1737440Z ............................................................................i....................... 6800/9781
2020-03-16T20:19:31.1490439Z .................................................................................................... 6900/9781
2020-03-16T20:19:33.2339903Z .................................................................................................... 7000/9781
---
2020-03-16T20:21:10.4505452Z .................................................................................................... 7800/9781
2020-03-16T20:21:15.5466923Z .................................................................................................... 7900/9781
2020-03-16T20:21:21.3856947Z .............................................................i...................................... 8000/9781
2020-03-16T20:21:30.8233570Z .................................................................................................... 8100/9781
2020-03-16T20:21:36.1743786Z ..........iiiiiiiiii.i.............................................................................. 8200/9781
2020-03-16T20:21:49.1723419Z .................................................................................................... 8400/9781
2020-03-16T20:21:58.0406138Z .................................................................................................... 8500/9781
2020-03-16T20:22:10.8037039Z .................................................................................................... 8600/9781
2020-03-16T20:22:17.0306842Z .................................................................................................... 8700/9781
---
2020-03-16T20:24:01.9439304Z ---- [ui] ui/issues/issue-70041.rs stdout ----
2020-03-16T20:24:01.9439500Z 
2020-03-16T20:24:01.9439722Z error: ui test compiled successfully!
2020-03-16T20:24:01.9439956Z status: exit code: 0
2020-03-16T20:24:01.9442270Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-70041.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-70041" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-A" "unused" "--edition=2018" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-70041/auxiliary"
2020-03-16T20:24:01.9443904Z ------------------------------------------
2020-03-16T20:24:01.9444097Z 
2020-03-16T20:24:01.9444466Z ------------------------------------------
2020-03-16T20:24:01.9444675Z stderr:
---
2020-03-16T20:24:01.9484799Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-03-16T20:24:01.9485259Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-03-16T20:24:01.9505391Z 
2020-03-16T20:24:01.9505564Z 
2020-03-16T20:24:01.9510308Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-03-16T20:24:01.9512924Z 
2020-03-16T20:24:01.9513018Z 
2020-03-16T20:24:01.9519817Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-03-16T20:24:01.9520193Z Build completed unsuccessfully in 1:00:27
2020-03-16T20:24:01.9520193Z Build completed unsuccessfully in 1:00:27
2020-03-16T20:24:01.9580988Z == clock drift check ==
2020-03-16T20:24:01.9598716Z   local time: Mon Mar 16 20:24:01 UTC 2020
2020-03-16T20:24:02.2523307Z   network time: Mon, 16 Mar 2020 20:24:02 GMT
2020-03-16T20:24:02.2527176Z == end clock drift check ==
2020-03-16T20:24:02.7565140Z 
2020-03-16T20:24:02.7631776Z ##[error]Bash exited with code '1'.
2020-03-16T20:24:02.7645039Z ##[section]Finishing: Run build
2020-03-16T20:24:02.7694747Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70053/merge to s
2020-03-16T20:24:02.7699914Z Task         : Get sources
2020-03-16T20:24:02.7700378Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-16T20:24:02.7700690Z Version      : 1.0.0
2020-03-16T20:24:02.7700904Z Author       : Microsoft
2020-03-16T20:24:02.7700904Z Author       : Microsoft
2020-03-16T20:24:02.7701234Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-16T20:24:02.7701628Z ==============================================================================
2020-03-16T20:24:03.0901244Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-03-16T20:24:03.0954979Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70053/merge to s
2020-03-16T20:24:03.1047503Z Cleaning up task key
2020-03-16T20:24:03.1048790Z Start cleaning up orphan processes.
2020-03-16T20:24:03.1249052Z Terminate orphan process: pid (4822) (python)
2020-03-16T20:24:03.1419479Z ##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

@jonas-schievink
Copy link
Contributor

@bors r-

@bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 16, 2020
@Centril Centril closed this Mar 16, 2020
@Centril Centril deleted the rollup-lumng3d branch March 16, 2020 20:49
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-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants