Rollup of 3 pull requests by Mark-Simulacrum · Pull Request #67435 · rust-lang/rust

Mark-Simulacrum · 2019-12-19T19:21:19Z

Successful merges:

Set release channel on non-dist builders #67351 (Set release channel on non-dist builders)
Rollup of 7 pull requests #67426 (Rollup of 7 pull requests)
Fix toolstate history format #67432 (Fix toolstate history format)

Failed merges:

This code was added to avoid UB in LLVM 6 and earlier, but we no longer support those LLVM versions. Since https://reviews.llvm.org/D47807 (released in LLVM 7), uitofp does exactly what we need. Closesrust-lang#51872

Toolstate publication only runs if the channel is "nightly" and previously the toolstate builders did not know that the channel was nightly (since they are not dist builders). A look through bootstrap seems to indicate that nothing should directly depend on the channel being set to `-dev` on the test builders, though this may cause some problems with UI tests (if for some reason they're dumping the channel into stderr), but we cannot find evidence of such so hopefully this is fine.

Normalize ident Perform unicode normalization on identifiers. Resolving the first bullet point in rust-lang#55467.

@ecstatic-morse

…morse Remove a const-if-hack in RawVec r? @ecstatic-morse cc @Centril

…=varkor Use structured suggestion for disambiguating method calls Fixrust-lang#65635.

…xcrichton add string.insert benchmarks This adds benchmarks for `String::insert` and `String::insert_str`

…atthewjasper Remove now-redundant range check on u128 -> f32 casts This code was added to avoid UB in LLVM 6 and earlier, but we no longer support those LLVM versions. Since https://reviews.llvm.org/D47807 (released in LLVM 7), uitofp does exactly what we need. Closesrust-lang#51872

@estebank

Fix unresolved type span inside async object Closesrust-lang#65180 r? @estebank It's hard to create a minimal repro for that issue, [decided](https://rust-lang.zulipchat.com/#narrow/stream/187312-wg-async-foundations/topic/meeting.202019.2E12.2E17/near/183675659) to give up finding mcve. cc [previous take](rust-lang#65668)

@Centril

Fix internal documentation typo r? @Centril

We were inserting *before* the existing newline, so we should prepend it not append it to our inserted string.

…ietroalbini Set release channel on non-dist builders Toolstate publication only runs if the channel is "nightly" and previously the toolstate builders did not know that the channel was nightly (since they are not dist builders). A look through bootstrap seems to indicate that nothing should directly depend on the channel being set to `-dev` on the test builders, though this may cause some problems with UI tests (if for some reason they're dumping the channel into stderr), but we cannot find evidence of such so hopefully this is fine. r? @pietroalbini

@ghost

Rollup of 7 pull requests Successful merges: - rust-lang#66670 (Normalize ident) - rust-lang#66755 (Remove a const-if-hack in RawVec) - rust-lang#67127 (Use structured suggestion for disambiguating method calls) - rust-lang#67281 (add string.insert benchmarks) - rust-lang#67328 (Remove now-redundant range check on u128 -> f32 casts) - rust-lang#67392 (Fix unresolved type span inside async object) - rust-lang#67421 (Fix internal documentation typo) Failed merges: r? @ghost

…ntril Fix toolstate history format We were inserting *before* the existing newline, so we should prepend it not append it to our inserted string.

Mark-Simulacrum · 2019-12-19T19:21:28Z

@bors r+ p=100

bors · 2019-12-19T19:21:30Z

📌 Commit 32bf790 has been approved by Mark-Simulacrum

rust-highfive · 2019-12-19T19:50:38Z

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-12-19T19:48:27.1154327Z do so (now or later) by using -b with the checkout command again. Example:
2019-12-19T19:48:27.1154604Z 2019-12-19T19:48:27.1154886Z git checkout -b <new-branch-name>
2019-12-19T19:48:27.1155318Z 2019-12-19T19:48:27.1155634Z HEAD is now at 3eb96210f Auto merge of #67435 - Mark-Simulacrum:rollup-tvlt9px, r=Mark-Simulacrum
2019-12-19T19:48:27.1559894Z ##[section]Starting: Setup environment
2019-12-19T19:48:27.1675966Z ==============================================================================
2019-12-19T19:48:27.1676222Z Task : Bash
2019-12-19T19:48:27.1676316Z Description : Run a Bash script on macOS, Linux, or Windows
---
2019-12-19T19:50:02.7967236Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-19T19:50:02.7967742Z See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-19T19:50:02.7970851Z 2019-12-19T19:50:02.7976328Z Failures
2019-12-19T19:50:02.7982969Z - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-12-19T19:50:02.7983597Z The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-12-19T19:50:03.2816686Z 2019-12-19T19:50:03.2906677Z ##[error]Bash exited with code '1'.
2019-12-19T19:50:03.3038028Z ##[section]Starting: Checkout
2019-12-19T19:50:03.3146019Z ==============================================================================
2019-12-19T19:50:03.3146123Z Task : Get sources
2019-12-19T19:50:03.3146320Z 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 · 2019-12-19T19:50:49Z

💔 Test failed - checks-azure

Mark-Simulacrum · 2019-12-19T20:21:56Z

@bors retry chocalety

bors · 2019-12-19T20:22:06Z

⌛ Testing commit 32bf790 with merge e433eed...

@ghost

Rollup of 3 pull requests Successful merges: - #67351 (Set release channel on non-dist builders) - #67426 (Rollup of 7 pull requests) - #67432 (Fix toolstate history format) Failed merges: r? @ghost

rust-highfive · 2019-12-19T20:44:41Z

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.

2019-12-19T20:42:06.4201760Z Build completed successfully in 0:01:42
2019-12-19T20:42:06.4215378Z + /scripts/validate-toolstate.sh
2019-12-19T20:42:06.4267442Z Cloning into 'rust-toolstate'...
2019-12-19T20:42:06.9471734Z Traceback (most recent call last):
2019-12-19T20:42:06.9472639Z File "../../src/tools/publish_toolstate.py", line 303, in <module>
2019-12-19T20:42:06.9473008Z cur_datetime
2019-12-19T20:42:06.9473128Z File "../../src/tools/publish_toolstate.py", line 182, in update_latest
2019-12-19T20:42:06.9474288Z for os in ['windows', 'linux']
2019-12-19T20:42:06.9474714Z File "../../src/tools/publish_toolstate.py", line 182, in <dictcomp>
2019-12-19T20:42:06.9475085Z for os in ['windows', 'linux']
2019-12-19T20:42:06.9475197Z File "../../src/tools/publish_toolstate.py", line 111, in read_current_status
2019-12-19T20:42:06.9475502Z (commit, status) = line.split('\t', 1)
2019-12-19T20:42:06.9475605Z ValueError: need more than 1 value to unpack
2019-12-19T20:42:06.9532949Z local time: Thu Dec 19 20:42:06 UTC 2019
2019-12-19T20:42:07.2165298Z network time: Thu, 19 Dec 2019 20:42:07 GMT
2019-12-19T20:42:07.2166221Z == end clock drift check ==
2019-12-19T20:42:08.9732570Z 2019-12-19T20:42:08.9732570Z 2019-12-19T20:42:08.9838996Z ##[error]Bash exited with code '1'.
2019-12-19T20:42:08.9877369Z ##[section]Starting: Checkout
2019-12-19T20:42:08.9879159Z ==============================================================================
2019-12-19T20:42:08.9879247Z Task : Get sources
2019-12-19T20:42:08.9879344Z 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 · 2019-12-19T20:44:56Z

💔 Test failed - checks-azure

Mark-Simulacrum · 2019-12-19T20:53:12Z

@bors retry

bors · 2019-12-19T20:53:23Z

⌛ Testing commit 32bf790 with merge fcecd1c9f627b30540af432820f7f4ec4aaf55f1...

rust-highfive · 2019-12-19T21:07:24Z

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.

2019-12-19T19:21:55.5269654Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-19T19:21:55.5452255Z ##[command]git config gc.auto 0
2019-12-19T19:21:55.5502771Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-19T19:21:55.5545484Z ##[command]git config --get-all http.proxy
2019-12-19T19:21:55.5650960Z ##[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/67435/merge:refs/remotes/pull/67435/merge
---
2019-12-19T19:30:48.2091236Z configure: build.locked-deps := True
2019-12-19T19:30:48.2091289Z configure: llvm.ccache := sccache
2019-12-19T19:30:48.2091460Z configure: build.cargo-native-static := True
2019-12-19T19:30:48.2091619Z configure: dist.missing-tools := True
2019-12-19T19:30:48.2091831Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2019-12-19T19:30:48.2091912Z configure: writing `config.toml` in current directory
2019-12-19T19:30:48.2091946Z configure: 2019-12-19T19:30:48.2092159Z configure: run `python /checkout/x.py --help`
2019-12-19T19:30:48.2092197Z configure: ---
2019-12-19T19:37:32.1837987Z Build completed successfully in 0:01:18
2019-12-19T19:37:32.1845409Z + /scripts/validate-toolstate.sh
2019-12-19T19:37:32.1891308Z Cloning into 'rust-toolstate'...
2019-12-19T19:37:32.7163696Z Traceback (most recent call last):
2019-12-19T19:37:32.7163834Z File "../../src/tools/publish_toolstate.py", line 303, in <module>
2019-12-19T19:37:32.7164142Z cur_datetime
2019-12-19T19:37:32.7164190Z File "../../src/tools/publish_toolstate.py", line 182, in update_latest
2019-12-19T19:37:32.7164728Z for os in ['windows', 'linux']
2019-12-19T19:37:32.7164802Z File "../../src/tools/publish_toolstate.py", line 182, in <dictcomp>
2019-12-19T19:37:32.7165027Z for os in ['windows', 'linux']
2019-12-19T19:37:32.7165073Z File "../../src/tools/publish_toolstate.py", line 111, in read_current_status
2019-12-19T19:37:32.7165331Z (commit, status) = line.split('\t', 1)
2019-12-19T19:37:32.7165378Z ValueError: need more than 1 value to unpack
2019-12-19T19:37:32.7202782Z local time: Thu Dec 19 19:37:32 UTC 2019
2019-12-19T19:37:32.9824830Z network time: Thu, 19 Dec 2019 19:37:32 GMT
2019-12-19T19:37:32.9830549Z == end clock drift check ==
2019-12-19T19:37:34.7695923Z 2019-12-19T19:37:34.7695923Z 2019-12-19T19:37:34.7743975Z ##[error]Bash exited with code '1'.
2019-12-19T19:37:34.7778934Z ##[section]Starting: Checkout
2019-12-19T19:37:34.7780332Z ==============================================================================
2019-12-19T19:37:34.7780391Z Task : Get sources
2019-12-19T19:37:34.7780427Z 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)

Mark-Simulacrum · 2019-12-19T21:18:44Z

@bors retry

bors · 2019-12-19T21:18:59Z

⌛ Testing commit 32bf790 with merge 5886cbadc97ee40213b3a2d5b36cb374a4c7dbdc...

rust-highfive · 2019-12-19T22:37:58Z

The job dist-i686-apple 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-12-19T22:32:39.3198200Z 2019-12-19T22:32:39.3517670Z [RUSTC-TIMING] cargo_clippy test:false 0.766
2019-12-19T22:32:42.7652090Z [RUSTC-TIMING] clippy_driver test:false 4.181
2019-12-19T22:32:42.7874270Z Finished release [optimized] target(s) in 1m 47s
2019-12-19T22:32:42.8159030Z 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-12-19T22:32:42.8161180Z the following dependencies are duplicated although they have the same features enabled:
2019-12-19T22:32:42.8161640Z the following dependencies have different features:
2019-12-19T22:32:42.8161640Z the following dependencies have different features:
2019-12-19T22:32:42.8163020Z smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)
2019-12-19T22:32:42.8164260Z `clippy-driver` additionally enabled features {"union"} at "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage1-tools/i686-apple-darwin/release/deps/libsmallvec-4d9460a0718804c5.rlib"
2019-12-19T22:32:42.8165460Z `cargo` additionally enabled features {} at "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage1-tools/i686-apple-darwin/release/deps/libsmallvec-39f1bfb959d0ea73.rlib"
2019-12-19T22:32:42.8165930Z 2019-12-19T22:32:42.8167020Z 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-12-19T22:32:42.8168170Z thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:198:13
2019-12-19T22:32:42.8255580Z failed to run: /Users/runner/runners/2.163.1/work/1/s/build/bootstrap/debug/bootstrap dist
2019-12-19T22:32:42.8255730Z Build completed unsuccessfully in 1:08:44
2019-12-19T22:32:42.8324630Z == clock drift check ==
2019-12-19T22:32:42.9434430Z local time: Thu Dec 19 22:32:42 UTC 2019
2019-12-19T22:32:42.9434430Z local time: Thu Dec 19 22:32:42 UTC 2019
2019-12-19T22:32:42.9434980Z network time: Thu, 19 Dec 2019 22:32:42 GMT
2019-12-19T22:32:42.9435390Z == end clock drift check ==
2019-12-19T22:32:42.9435520Z 2019-12-19T22:32:42.9525770Z ##[error]Bash exited with code '1'.
2019-12-19T22:32:42.9585690Z ##[section]Starting: Checkout
2019-12-19T22:32:42.9589360Z ==============================================================================
2019-12-19T22:32:42.9589460Z Task : Get sources
2019-12-19T22:32:42.9589540Z 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 · 2019-12-19T22:42:18Z

💔 Test failed - checks-azure

estebankand others added 28 commits December 11, 2019 17:42

Use structured suggestion for disambiguating method calls
3980342
Fixrust-lang#65635.

review comments
8c4f1d5

Remove now-redundant range check on u128 -> f32 casts
6ad0b55
This code was added to avoid UB in LLVM 6 and earlier, but we no longer support those LLVM versions. Since https://reviews.llvm.org/D47807 (released in LLVM 7), uitofp does exactly what we need. Closesrust-lang#51872

Add benchmarks for string::insert(_str)
c6321a4

add debuginfo in generator_interior
c1241bf

record previous unresolve span for generator error reporting
ff4f6a1

Remove a const-if-hack in RawVec
17aa0cb

remove a bit more hackery
3ec3fca

use usize::MAX instead of !0
baaf864

fix import
951f041

add fixme
2535435

no need to bootstrap
7d26811

Normalize identifiers in librustc_parse.
35af4e2

Add a test and bless existing test case.
5a75934

Add unicode-normalization to whitelist.
49f3bc9

Fix documentation typo
bfc02bd

Rollup merge ofrust-lang#66670- crlf0710:normalize_ident, r=estebank
02206dc
Normalize ident Perform unicode normalization on identifiers. Resolving the first bullet point in rust-lang#55467.

Rollup merge ofrust-lang#66755- mark-i-m:const-vec-new, r=ecstatic-…
208f353
…morse Remove a const-if-hack in RawVec r? @ecstatic-morse cc @Centril

Rollup merge ofrust-lang#67127- estebank:disambiguate-suggestion, r…
8c15656
…=varkor Use structured suggestion for disambiguating method calls Fixrust-lang#65635.

Rollup merge ofrust-lang#67281- llogiq:nonoverlapping-insert, r=ale…
4254d29
…xcrichton add string.insert benchmarks This adds benchmarks for `String::insert` and `String::insert_str`

Rollup merge ofrust-lang#67421- LeSeulArtichaut:patch-1, r=Centril
4ff4d6c
Fix internal documentation typo r? @Centril

Fix toolstate history format
1787b2b
We were inserting *before* the existing newline, so we should prepend it not append it to our inserted string.

Rollup merge ofrust-lang#67432- Mark-Simulacrum:fix-toolstate, r=Ce…
32bf790
…ntril Fix toolstate history format We were inserting *before* the existing newline, so we should prepend it not append it to our inserted string.

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 Dec 19, 2019

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 Dec 19, 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 Dec 19, 2019

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 Dec 19, 2019

bors mentioned this pull request Dec 19, 2019
Const prop should finish propagation into user defined variables #67130
Merged

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 Dec 19, 2019

Mark-Simulacrum closed this Dec 19, 2019

Mark-Simulacrum mentioned this pull request Dec 19, 2019
Normalize ident #66670
Merged

JohnTitor added the rollup A PR which is a rollup label Dec 23, 2019

Uh oh!

Uh oh!

Conversation

Mark-Simulacrum commented Dec 19, 2019

Uh oh!

Mark-Simulacrum commented Dec 19, 2019

Uh oh!

bors commented Dec 19, 2019

Uh oh!

rust-highfive commented Dec 19, 2019

Uh oh!

bors commented Dec 19, 2019

Uh oh!

Mark-Simulacrum commented Dec 19, 2019

Uh oh!

bors commented Dec 19, 2019

Uh oh!

rust-highfive commented Dec 19, 2019

Uh oh!

bors commented Dec 19, 2019

Uh oh!

Mark-Simulacrum commented Dec 19, 2019

Uh oh!

bors commented Dec 19, 2019

Uh oh!

rust-highfive commented Dec 19, 2019

Uh oh!

Mark-Simulacrum commented Dec 19, 2019

Uh oh!

bors commented Dec 19, 2019

Uh oh!

rust-highfive commented Dec 19, 2019

Uh oh!

bors commented Dec 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants