Skip to content

Fixes #64919. Suggest fix based on operator precendence. - #64933

Merged
bors merged 2 commits into
rust-lang:masterfrom
sam09:master
Oct 2, 2019
Merged

Fixes #64919. Suggest fix based on operator precendence.#64933
bors merged 2 commits into
rust-lang:masterfrom
sam09:master

Conversation

@sam09

@sam09sam09 commented Sep 30, 2019

Copy link
Copy Markdown
Contributor

Fixes#64919

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 30, 2019
@sam09

Copy link
Copy Markdown
ContributorAuthor

r? @varkor

@rust-highfiverust-highfive assigned varkor and unassigned cramertjSep 30, 2019
Comment threadsrc/test/ui/mismatched_types/abridged.rs Outdated
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-6.0 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-09-30T23:11:49.3295548Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-30T23:11:49.3468197Z ##[command]git config gc.auto 0
2019-09-30T23:11:49.3549657Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-30T23:11:49.3605905Z ##[command]git config --get-all http.proxy
2019-09-30T23:11:49.3747692Z ##[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/64933/merge:refs/remotes/pull/64933/merge
---
2019-09-30T23:19:10.7286040Z Compiling serde_json v1.0.40
2019-09-30T23:19:12.5286269Z Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-09-30T23:19:23.9643600Z Finished release [optimized] target(s) in 1m 31s
2019-09-30T23:19:23.9724490Z tidy check
2019-09-30T23:19:24.8434594Z tidy error: /checkout/src/librustc_typeck/check/mod.rs:4348: line longer than 100 chars
2019-09-30T23:19:24.8434792Z tidy error: /checkout/src/librustc_typeck/check/mod.rs:4349: line longer than 100 chars
2019-09-30T23:19:26.0789513Z some tidy checks failed
2019-09-30T23:19:26.0790510Z 2019-09-30T23:19:26.0790510Z 2019-09-30T23:19:26.0791693Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-09-30T23:19:26.0797371Z 2019-09-30T23:19:26.0797427Z 2019-09-30T23:19:26.0808541Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-09-30T23:19:26.0808866Z Build completed unsuccessfully in 0:01:34
2019-09-30T23:19:26.0808866Z Build completed unsuccessfully in 0:01:34
2019-09-30T23:19:26.0865271Z == clock drift check ==
2019-09-30T23:19:26.0880568Z local time: Mon Sep 30 23:19:26 UTC 2019
2019-09-30T23:19:26.1726195Z network time: Mon, 30 Sep 2019 23:19:26 GMT
2019-09-30T23:19:26.1729297Z == end clock drift check ==
2019-09-30T23:19:28.0404474Z ##[error]Bash exited with code '1'.
2019-09-30T23:19:28.0440935Z ##[section]Starting: Checkout
2019-09-30T23:19:28.0443110Z ==============================================================================
2019-09-30T23:19:28.0443182Z Task : Get sources
2019-09-30T23:19:28.0443382Z 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)

Comment threadsrc/librustc_typeck/check/mod.rs
@estebank

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 1, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 9e4eb46 has been approved by estebank

@borsbors 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 Oct 1, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 1, 2019
@tmandrytmandry mentioned this pull request Oct 1, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 1, 2019
@tmandrytmandry mentioned this pull request Oct 1, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@CentrilCentril mentioned this pull request Oct 1, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@CentrilCentril mentioned this pull request Oct 1, 2019
bors added a commit that referenced this pull request Oct 1, 2019
Rollup of 7 pull requests
Successful merges:
- #63416 (apfloat: improve doc comments)
- #64820 (BTreeSet intersection, is_subset & difference optimizations)
- #64910 (syntax: cleanup param, method, and misc parsing)
- #64912 (Remove unneeded `fn main` blocks from docs)
- #64933 (Fixes#64919. Suggest fix based on operator precendence.)
- #64943 (Add lower bound doctests for `saturating_{add,sub}` signed ints)
- #64950 (Simplify interners)
Failed merges:
r? @ghost
@bors
bors merged commit 9e4eb46 into rust-lang:masterOct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

Suggested fix does not account for operator precedence

7 participants

@sam09@rust-highfive@estebank@bors@jonas-schievink@varkor@cramertj