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 8 pull requests #70066

Closed
wants to merge 47 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 17, 2020

Successful merges:

Failed merges:

r? @ghost

JohnTitor and others added 30 commits March 5, 2020 22:59
* Rebuild sanitizers runtimes when LLVM submodule commit changes.
* When rebuilding LLVM / sanitizers, remove the stamp file before
  starting the build process to invalidate previous build output.
Regions in TypeckTables will be erased, so are unusable for error
reporting.
Also skip duplicated region solving entirely with `-Zborrowck=mir`.
Centril and others added 17 commits March 16, 2020 19:57
typo fix + markdown fix for consistency
…henkov

Make macro metavars respect (non-)hygiene

This makes them more consistent with other name resolution while not breaking any code on crater.
…komatsakis

Erase regions in writeback

Regions in `TypeckTables` (except canonicalized user annotations) are now erased. Further, we no longer do lexical region solving on item bodies with `-Zborrowck=mir`.

cc rust-lang#68261
r? @nikomatsakis
…r=Mark-Simulacrum

bootstrap: Use hash to determine if sanitizers needs to be rebuilt

* Rebuild sanitizers runtimes when LLVM submodule commit changes.
* When rebuilding LLVM / sanitizers, remove the stamp file before
  starting the build process to invalidate previous build output.
Expansion-driven outline module parsing

After this PR, the parser will not do any conditional compilation or loading of external module files when `mod foo;` is encountered. Instead, the parser only leaves `mod foo;` in place in the AST, with no items filled in. Expansion later kicks in and will load the actual files and do the parsing. This entails that the following is now valid:

```rust
#[cfg(FALSE)]
mod foo {
    mod bar {
        mod baz; // `foo/bar/baz.rs` doesn't exist, but no error!
    }
}
```

Fixes rust-lang#64197.

r? @petrochenkov
implement zeroed and uninitialized with MaybeUninit

This is the second attempt of doing such a change (first PR: rust-lang#62150). The last change [got reverted](rust-lang#63343) because it [caused](rust-lang#62825) some [issues](rust-lang#52898 (comment)) in [code that incorrectly used these functions](AltF02/x11-rs#99).

Since then, the [problematic code has been fixed](AltF02/x11-rs#101), and rustc [gained a lint](rust-lang#63346) that is able to detect many misuses of these functions statically and a [dynamic check that panics](rust-lang#66059) instead of causing UB for some incorrect uses.

Fixes rust-lang#62825
Cosmetic fixes in documentation

typo fix + markdown fix for consistency
Update books

## reference

4 commits in 559e09c..e2f11fe
2020-03-02 01:17:14 +0100 to 2020-03-10 06:59:24 +0100
- Update rustc-guide to rustc-dev-guide (rust-lang/reference#777)
- Fix expression and statement grammar. (rust-lang/reference#776)
- Fix grammar for tuple struct patterns. (rust-lang/reference#775)
- A typo? (rust-lang/reference#770)

## rust-by-example

3 commits in db57f899ea2a56a544c8d280cbf033438666273d..cb369ae95ca36b841960182d26f6d5d9b2e3cc18
2020-02-18 17:46:46 -0300 to 2020-03-14 12:13:22 -0500
- Use rust-lang/rust linkchecker on CI. (rust-lang/rust-by-example#1310)
- Rewrite freeze.md (rust-lang/rust-by-example#1314)
- Clarify type suffixing with example (rust-lang/rust-by-example#1312)

## embedded-book

2 commits in b81ffb7a6f4c5aaed92786e770e99db116aa4ebd..d22a9c487c78095afc4584f1d9b4ec43529d713c
2020-02-27 08:06:04 +0000 to 2020-03-04 09:46:30 +0000
- Updated documentation on profile-overrides  (rust-embedded/book#230)
- Update information on Cargo `profile-overrides`  (rust-embedded/book#229)
@Centril
Copy link
Contributor Author

Centril commented Mar 17, 2020

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Mar 17, 2020

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

bors commented Mar 17, 2020

⌛ Testing commit 2e0141f with merge df244dd982ad9297c6f8617f44fa3a0678109289...

@Centril Centril closed this Mar 17, 2020
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-debug 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-17T05:46:50.6060550Z     Checking rustc_save_analysis v0.0.0 (/checkout/src/librustc_save_analysis)
2020-03-17T05:46:51.4434494Z     Checking rustc_resolve v0.0.0 (/checkout/src/librustc_resolve)
2020-03-17T05:46:54.1926646Z     Checking rustc_typeck v0.0.0 (/checkout/src/librustc_typeck)
2020-03-17T05:46:54.4110710Z     Checking rustc_lint v0.0.0 (/checkout/src/librustc_lint)
2020-03-17T05:46:54.6983885Z error[E0432]: unresolved import `rustc_infer::infer::SuppressRegionErrors`
2020-03-17T05:46:54.6984835Z   --> src/librustc_typeck/impl_wf_check/min_specialization.rs:78:37
2020-03-17T05:46:54.6985414Z    |
2020-03-17T05:46:54.6986140Z 78 | use rustc_infer::infer::{InferCtxt, SuppressRegionErrors, TyCtxtInferExt};
2020-03-17T05:46:54.6987442Z    |                                     ^^^^^^^^^^^^^^^^^^^^ no `SuppressRegionErrors` in `infer`
2020-03-17T05:46:56.9849473Z     Checking rustc_traits v0.0.0 (/checkout/src/librustc_traits)
2020-03-17T05:46:57.5806247Z     Checking rustc_mir_build v0.0.0 (/checkout/src/librustc_mir_build)
2020-03-17T05:46:58.8582303Z error: aborting due to previous error
2020-03-17T05:46:58.8583283Z 
2020-03-17T05:46:58.8583283Z 
2020-03-17T05:46:58.8584179Z For more information about this error, try `rustc --explain E0432`.
2020-03-17T05:46:58.8644608Z error: could not compile `rustc_typeck`.
2020-03-17T05:46:58.8645192Z 
2020-03-17T05:46:58.8646705Z To learn more, run the command again with --verbose.
2020-03-17T05:46:58.8647991Z warning: build failed, waiting for other jobs to finish...
2020-03-17T05:47:00.4725334Z error: build failed
2020-03-17T05:47:00.4753945Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
2020-03-17T05:47:00.4769348Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2020-03-17T05:47:00.4769771Z Build completed unsuccessfully in 0:04:36
2020-03-17T05:47:00.4822578Z == clock drift check ==
2020-03-17T05:47:00.4843348Z   local time: Tue Mar 17 05:47:00 UTC 2020
2020-03-17T05:47:00.4843348Z   local time: Tue Mar 17 05:47:00 UTC 2020
2020-03-17T05:47:00.6043908Z   network time: Tue, 17 Mar 2020 05:47:00 GMT
2020-03-17T05:47:00.6048073Z == end clock drift check ==
2020-03-17T05:47:01.3065627Z 
2020-03-17T05:47:01.3135484Z ##[error]Bash exited with code '1'.
2020-03-17T05:47:01.3203306Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-17T05:47:01.3208765Z ==============================================================================
2020-03-17T05:47:01.3209166Z Task         : Get sources
2020-03-17T05:47:01.3209556Z 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 @rust-lang/infra. (Feature Requests)

@Centril Centril deleted the rollup-hvparm2 branch March 17, 2020 05:48
@rust-highfive
Copy link
Collaborator

The job mingw-check 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-17T05:36:13.1850590Z ========================== Starting Command Output ===========================
2020-03-17T05:36:13.1865570Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/3c45a3f7-7ee0-4c2b-b67b-519bf065d815.sh
2020-03-17T05:36:13.2039371Z 
2020-03-17T05:36:13.2103042Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-17T05:36:13.2119487Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70066/merge to s
2020-03-17T05:36:13.2127201Z Task         : Get sources
2020-03-17T05:36:13.2127462Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-17T05:36:13.2127906Z Version      : 1.0.0
2020-03-17T05:36:13.2128303Z Author       : Microsoft
---
2020-03-17T05:36:14.5484751Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-17T05:36:14.5533146Z ##[command]git config gc.auto 0
2020-03-17T05:36:14.5560258Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-17T05:36:14.5590850Z ##[command]git config --get-all http.proxy
2020-03-17T05:36:14.5664770Z ##[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/70066/merge:refs/remotes/pull/70066/merge
---
2020-03-17T05:40:05.0623176Z Successfully built 803d80d10828
2020-03-17T05:40:05.0664000Z Successfully tagged rust-ci:latest
2020-03-17T05:40:05.1018135Z Built container sha256:803d80d1082889e1b6e456e2a5474318b46214b0f524ce4f2bb4cd127c437124
2020-03-17T05:40:05.1031589Z Uploading finished image to https://rust-lang-ci-sccache2.s3.amazonaws.com/docker/60527bffc15381f3e0c55e9d5e0bec1faa9716d5daa2c5185b1eada10957f02df970124fe9c0b0ab4e67baad8366e42bbf86154e29c48a6ddf37e43ab6c347a2
2020-03-17T05:40:55.9929421Z upload failed: - to s3://rust-lang-ci-sccache2/docker/60527bffc15381f3e0c55e9d5e0bec1faa9716d5daa2c5185b1eada10957f02df970124fe9c0b0ab4e67baad8366e42bbf86154e29c48a6ddf37e43ab6c347a2 An error occurred (InvalidAccessKeyId) when calling the CreateMultipartUpload operation: The AWS Access Key Id you provided does not exist in our records.
2020-03-17T05:40:56.4320719Z [CI_JOB_NAME=mingw-check]
2020-03-17T05:40:56.4352642Z == clock drift check ==
2020-03-17T05:40:56.4362066Z   local time: Tue Mar 17 05:40:56 UTC 2020
2020-03-17T05:40:56.5782206Z   network time: Tue, 17 Mar 2020 05:40:56 GMT
---
2020-03-17T05:44:46.9476114Z     Checking rustc_save_analysis v0.0.0 (/checkout/src/librustc_save_analysis)
2020-03-17T05:44:47.6848522Z     Checking rustc_resolve v0.0.0 (/checkout/src/librustc_resolve)
2020-03-17T05:44:50.2262305Z     Checking rustc_typeck v0.0.0 (/checkout/src/librustc_typeck)
2020-03-17T05:44:50.2404751Z     Checking rustc_lint v0.0.0 (/checkout/src/librustc_lint)
2020-03-17T05:44:50.6447669Z error[E0432]: unresolved import `rustc_infer::infer::SuppressRegionErrors`
2020-03-17T05:44:50.6448546Z   --> src/librustc_typeck/impl_wf_check/min_specialization.rs:78:37
2020-03-17T05:44:50.6449002Z    |
2020-03-17T05:44:50.6449778Z 78 | use rustc_infer::infer::{InferCtxt, SuppressRegionErrors, TyCtxtInferExt};
2020-03-17T05:44:50.6450769Z    |                                     ^^^^^^^^^^^^^^^^^^^^ no `SuppressRegionErrors` in `infer`
2020-03-17T05:44:52.3935684Z     Checking rustc_ty v0.0.0 (/checkout/src/librustc_ty)
2020-03-17T05:44:52.6748585Z     Checking rustc_passes v0.0.0 (/checkout/src/librustc_passes)
2020-03-17T05:44:53.8042954Z     Checking rustc_mir v0.0.0 (/checkout/src/librustc_mir)
2020-03-17T05:44:53.9924737Z error: aborting due to previous error
2020-03-17T05:44:53.9924737Z error: aborting due to previous error
2020-03-17T05:44:53.9928412Z 
2020-03-17T05:44:53.9933674Z For more information about this error, try `rustc --explain E0432`.
2020-03-17T05:44:53.9973828Z error: could not compile `rustc_typeck`.
2020-03-17T05:44:53.9974066Z 
2020-03-17T05:44:53.9974452Z To learn more, run the command again with --verbose.
2020-03-17T05:44:53.9974976Z warning: build failed, waiting for other jobs to finish...
2020-03-17T05:45:04.9768420Z error: build failed
2020-03-17T05:45:04.9788053Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
2020-03-17T05:45:04.9793887Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2020-03-17T05:45:04.9794338Z Build completed unsuccessfully in 0:04:08
2020-03-17T05:45:04.9836391Z == clock drift check ==
2020-03-17T05:45:04.9843215Z   local time: Tue Mar 17 05:45:04 UTC 2020
2020-03-17T05:45:04.9843215Z   local time: Tue Mar 17 05:45:04 UTC 2020
2020-03-17T05:45:05.2534537Z   network time: Tue, 17 Mar 2020 05:45:05 GMT
2020-03-17T05:45:05.2541057Z == end clock drift check ==
2020-03-17T05:45:05.9210194Z 
2020-03-17T05:45:05.9263971Z ##[error]Bash exited with code '1'.
2020-03-17T05:45:05.9299313Z ##[section]Finishing: Run build
2020-03-17T05:45:05.9333398Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70066/merge to s
2020-03-17T05:45:05.9337658Z Task         : Get sources
2020-03-17T05:45:05.9337938Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-17T05:45:05.9338189Z Version      : 1.0.0
2020-03-17T05:45:05.9338389Z Author       : Microsoft
2020-03-17T05:45:05.9338389Z Author       : Microsoft
2020-03-17T05:45:05.9338670Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-17T05:45:05.9338993Z ==============================================================================
2020-03-17T05:45:06.2168243Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-03-17T05:45:06.2217622Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70066/merge to s
2020-03-17T05:45:06.2298372Z Cleaning up task key
2020-03-17T05:45:06.2299443Z Start cleaning up orphan processes.
2020-03-17T05:45:06.2456726Z Terminate orphan process: pid (3393) (python)
2020-03-17T05:45:06.2637060Z ##[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)

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants