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 3 pull requests #67434

Closed
wants to merge 28 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 19, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 28 commits December 11, 2019 17:42
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.

Closes rust-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.
…=varkor

Use structured suggestion for disambiguating method calls

Fix rust-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.

Closes rust-lang#51872
Fix unresolved type span inside async object

Closes rust-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)
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
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.
@Centril
Copy link
Contributor Author

Centril commented Dec 19, 2019

@bors r+ p=200 rollup=never

@bors
Copy link
Contributor

bors commented Dec 19, 2019

📌 Commit 8fe0f22 has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 19, 2019

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@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 Dec 19, 2019
@Centril Centril added the rollup A PR which is a rollup label Dec 19, 2019
@bors
Copy link
Contributor

bors commented Dec 19, 2019

⌛ Testing commit 8fe0f22 with merge 04c5ae1...

bors added a commit that referenced this pull request Dec 19, 2019
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
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.
2019-12-19T19:13:57.7401411Z Build completed successfully in 0:01:26
2019-12-19T19:13:57.7411915Z + /scripts/validate-toolstate.sh
2019-12-19T19:13:57.7465446Z Cloning into 'rust-toolstate'...
2019-12-19T19:13:58.3513779Z Traceback (most recent call last):
2019-12-19T19:13:58.3513921Z   File "../../src/tools/publish_toolstate.py", line 303, in <module>
2019-12-19T19:13:58.3514023Z     cur_datetime
2019-12-19T19:13:58.3514099Z   File "../../src/tools/publish_toolstate.py", line 182, in update_latest
2019-12-19T19:13:58.3514689Z     for os in ['windows', 'linux']
2019-12-19T19:13:58.3514769Z   File "../../src/tools/publish_toolstate.py", line 182, in <dictcomp>
2019-12-19T19:13:58.3514960Z     for os in ['windows', 'linux']
2019-12-19T19:13:58.3515040Z   File "../../src/tools/publish_toolstate.py", line 111, in read_current_status
2019-12-19T19:13:58.3515246Z     (commit, status) = line.split('\t', 1)
2019-12-19T19:13:58.3515321Z ValueError: need more than 1 value to unpack
2019-12-19T19:13:58.3558351Z   local time: Thu Dec 19 19:13:58 UTC 2019
2019-12-19T19:13:58.4968348Z   network time: Thu, 19 Dec 2019 19:13:58 GMT
2019-12-19T19:13:58.4968772Z == end clock drift check ==
2019-12-19T19:14:00.2394074Z 
2019-12-19T19:14:00.2394074Z 
2019-12-19T19:14:00.2475488Z ##[error]Bash exited with code '1'.
2019-12-19T19:14:00.2513425Z ##[section]Starting: Checkout
2019-12-19T19:14:00.2515018Z ==============================================================================
2019-12-19T19:14:00.2515110Z Task         : Get sources
2019-12-19T19:14:00.2515355Z 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
Copy link
Contributor

bors commented Dec 19, 2019

💔 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 Dec 19, 2019
@Centril Centril closed this Dec 19, 2019
@Centril Centril deleted the rollup-7auubyo branch December 19, 2019 19:15
@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.
2019-12-19T18:55:32.3945467Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-19T18:55:33.3931148Z ##[command]git config gc.auto 0
2019-12-19T18:55:33.3936748Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-19T18:55:33.3939437Z ##[command]git config --get-all http.proxy
2019-12-19T18:55:33.3942744Z ##[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/67434/merge:refs/remotes/pull/67434/merge
---
2019-12-19T19:04:12.5972067Z configure: build.locked-deps    := True
2019-12-19T19:04:12.5972113Z configure: llvm.ccache          := sccache
2019-12-19T19:04:12.5972313Z configure: build.cargo-native-static := True
2019-12-19T19:04:12.5972470Z configure: dist.missing-tools   := True
2019-12-19T19:04:12.5973250Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2019-12-19T19:04:12.5973377Z configure: writing `config.toml` in current directory
2019-12-19T19:04:12.5973419Z configure: 
2019-12-19T19:04:12.5973612Z configure: run `python /checkout/x.py --help`
2019-12-19T19:04:12.5973646Z configure: 
---
2019-12-19T19:10:44.5096983Z Build completed successfully in 0:01:17
2019-12-19T19:10:44.5103582Z + /scripts/validate-toolstate.sh
2019-12-19T19:10:44.5145748Z Cloning into 'rust-toolstate'...
2019-12-19T19:10:44.9590362Z Traceback (most recent call last):
2019-12-19T19:10:44.9591903Z   File "../../src/tools/publish_toolstate.py", line 303, in <module>
2019-12-19T19:10:44.9595428Z     cur_datetime
2019-12-19T19:10:44.9595504Z   File "../../src/tools/publish_toolstate.py", line 182, in update_latest
2019-12-19T19:10:44.9595981Z     for os in ['windows', 'linux']
2019-12-19T19:10:44.9596052Z   File "../../src/tools/publish_toolstate.py", line 182, in <dictcomp>
2019-12-19T19:10:44.9599287Z     for os in ['windows', 'linux']
2019-12-19T19:10:44.9599359Z   File "../../src/tools/publish_toolstate.py", line 111, in read_current_status
2019-12-19T19:10:44.9599564Z     (commit, status) = line.split('\t', 1)
2019-12-19T19:10:44.9599631Z ValueError: need more than 1 value to unpack
2019-12-19T19:10:44.9633310Z   local time: Thu Dec 19 19:10:44 UTC 2019
2019-12-19T19:10:45.2257675Z   network time: Thu, 19 Dec 2019 19:10:45 GMT
2019-12-19T19:10:45.2262113Z == end clock drift check ==
2019-12-19T19:10:47.0680659Z 
2019-12-19T19:10:47.0680659Z 
2019-12-19T19:10:47.0776370Z ##[error]Bash exited with code '1'.
2019-12-19T19:10:47.0801787Z ##[section]Starting: Checkout
2019-12-19T19:10:47.0803330Z ==============================================================================
2019-12-19T19:10:47.0803371Z Task         : Get sources
2019-12-19T19:10:47.0803425Z 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)

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-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants