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 2 pull requests #67433

Closed
wants to merge 26 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 26 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
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.
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 84d2918 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 84d2918 with merge 127fd8d2428ac850fe60cd415a8b4f853ff9c449...

@Centril
Copy link
Contributor Author

Centril commented Dec 19, 2019

@bors r- retry

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 19, 2019
@Centril Centril closed this Dec 19, 2019
@Centril Centril deleted the rollup-8v6sluf branch December 19, 2019 18:56
@rust-highfive
Copy link
Collaborator

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 @TimNN. (Feature Requests)

@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:52:26.3146504Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-19T18:52:26.3376373Z ##[command]git config gc.auto 0
2019-12-19T18:52:26.3460266Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-19T18:52:26.3524488Z ##[command]git config --get-all http.proxy
2019-12-19T18:52:26.3692630Z ##[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/67433/merge:refs/remotes/pull/67433/merge
---
2019-12-19T19:03:03.1888752Z configure: build.locked-deps    := True
2019-12-19T19:03:03.1888817Z configure: llvm.ccache          := sccache
2019-12-19T19:03:03.1889100Z configure: build.cargo-native-static := True
2019-12-19T19:03:03.1889369Z configure: dist.missing-tools   := True
2019-12-19T19:03:03.1889673Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2019-12-19T19:03:03.1889814Z configure: writing `config.toml` in current directory
2019-12-19T19:03:03.1889867Z configure: 
2019-12-19T19:03:03.1890157Z configure: run `python /checkout/x.py --help`
2019-12-19T19:03:03.1890232Z configure: 
---
2019-12-19T19:11:45.8216455Z Build completed successfully in 0:01:42
2019-12-19T19:11:45.8226490Z + /scripts/validate-toolstate.sh
2019-12-19T19:11:45.8289752Z Cloning into 'rust-toolstate'...
2019-12-19T19:11:46.4361364Z Traceback (most recent call last):
2019-12-19T19:11:46.4361492Z   File "../../src/tools/publish_toolstate.py", line 303, in <module>
2019-12-19T19:11:46.4361542Z     cur_datetime
2019-12-19T19:11:46.4368152Z   File "../../src/tools/publish_toolstate.py", line 182, in update_latest
2019-12-19T19:11:46.4368867Z     for os in ['windows', 'linux']
2019-12-19T19:11:46.4368929Z   File "../../src/tools/publish_toolstate.py", line 182, in <dictcomp>
2019-12-19T19:11:46.4369191Z     for os in ['windows', 'linux']
2019-12-19T19:11:46.4369246Z   File "../../src/tools/publish_toolstate.py", line 111, in read_current_status
2019-12-19T19:11:46.4369486Z     (commit, status) = line.split('\t', 1)
2019-12-19T19:11:46.4369556Z ValueError: need more than 1 value to unpack
2019-12-19T19:11:46.4409737Z   local time: Thu Dec 19 19:11:46 UTC 2019
2019-12-19T19:11:46.7068442Z   network time: Thu, 19 Dec 2019 19:11:46 GMT
2019-12-19T19:11:46.7072524Z == end clock drift check ==
2019-12-19T19:11:48.2993996Z 
2019-12-19T19:11:48.2993996Z 
2019-12-19T19:11:48.3103607Z ##[error]Bash exited with code '1'.
2019-12-19T19:11:48.3144232Z ##[section]Starting: Checkout
2019-12-19T19:11:48.3146362Z ==============================================================================
2019-12-19T19:11:48.3146425Z Task         : Get sources
2019-12-19T19:11:48.3146479Z 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-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.

10 participants