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 #63424

Closed
wants to merge 40 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 9, 2019

Successful merges:

Failed merges:

r? @ghost

newpavlov and others added 30 commits July 17, 2019 18:36
```
error: unexpected `(` after qualified path
  --> $DIR/vec-macro-in-pattern.rs:3:14
   |
LL |         Some(vec![x]) => (),
   |              ^^^^^^^
   |              |
   |              unexpected `(` after qualified path
   |              in this macro invocation
   |              use a slice pattern here instead
   |
   = help: for more information, see https://doc.rust-lang.org/edition-guide/rust-2018/slice-patterns.html
   = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
```
estebank and others added 10 commits August 9, 2019 09:40
…, r=alexcrichton

Stabilize checked_duration_since for 1.38.0

Looks like it has already found some use in projects.

Resolves rust-lang#58402.
Tweak mismatched types error

- Change expected/found for type mismatches in `break`
- Be more accurate when talking about diverging match arms
- Tweak wording of function without a return value
- Suggest calling bare functions when their return value can be coerced to the expected type
- Give more parsing errors when encountering `foo(_, _, _)`

Fix rust-lang#51767, fix rust-lang#62677, fix rust-lang#63136, cc rust-lang#37384, cc rust-lang#35241, cc rust-lang#51669.
…s, r=Centril

Use associated_type_bounds where applicable - closes rust-lang#61738
…richton

Sort the fat LTO modules to produce deterministic output.

Some projects that use LTO for their release builds are not reproducible.  We can fix this by sorting the fat LTO modules before using them.

It might also be useful to do this for thin LTO, but I couldn't get that to work to test it so I didn't do it.
…vink

Add test for issue 36804

I slightly reduced the repro that ICEs on nightly-2017-01-20.

Closes rust-lang#36804
More explicit diagnostic when using a `vec![]` in a pattern

```
error: unexpected `(` after qualified path
  --> $DIR/vec-macro-in-pattern.rs:3:14
   |
LL |         Some(vec![x]) => (),
   |              ^^^^^^^
   |              |
   |              unexpected `(` after qualified path
   |              in this macro invocation
   |              use a slice pattern here instead
   |
   = help: for more information, see https://doc.rust-lang.org/edition-guide/rust-2018/slice-patterns.html
   = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
```

Fix rust-lang#61933.
check against more collisions for TypeId of fn pointer

Cc rust-lang/rfcs#2738 (comment)
@Centril
Copy link
Contributor Author

Centril commented Aug 9, 2019

@bors r+ p=15 rollup=never

@bors
Copy link
Contributor

bors commented Aug 9, 2019

📌 Commit 02980cd 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 Aug 9, 2019
@bors
Copy link
Contributor

bors commented Aug 9, 2019

⌛ Testing commit 02980cd with merge 84b17296f7f130f123a08a9735afeda405734d0b...

@rust-highfive
Copy link
Collaborator

The job i686-apple of your PR failed (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-08-09T21:18:58.7921380Z [TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "i686-apple-darwin" }, target: "i686-apple-darwin", tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 104.415
2019-08-09T21:18:58.7922680Z tidy check
2019-08-09T21:19:09.6954750Z * 578 error codes
2019-08-09T21:19:09.6955130Z * highest error code: E0733
2019-08-09T21:19:10.1406460Z tidy error: /Users/vsts/agent/2.155.1/work/1/s/src/tools/tidy/src/features/tests.rs:5: mismatches the `issue` in previous
2019-08-09T21:19:12.4116810Z some tidy checks failed
2019-08-09T21:19:12.4123280Z 
2019-08-09T21:19:12.4123280Z 
2019-08-09T21:19:12.4125210Z command did not execute successfully: "/Users/vsts/agent/2.155.1/work/1/s/build/i686-apple-darwin/stage0-tools-bin/tidy" "/Users/vsts/agent/2.155.1/work/1/s/src" "/Users/vsts/agent/2.155.1/work/1/s/build/i686-apple-darwin/stage0/bin/cargo" "--no-vendor"
2019-08-09T21:19:12.4126480Z 
2019-08-09T21:19:12.4127000Z 
2019-08-09T21:19:12.4136450Z failed to run: /Users/vsts/agent/2.155.1/work/1/s/build/bootstrap/debug/bootstrap test
2019-08-09T21:19:12.4136880Z Build completed unsuccessfully in 0:02:03
2019-08-09T21:19:12.4136880Z Build completed unsuccessfully in 0:02:03
2019-08-09T21:19:12.4402290Z ##[error]Bash exited with code '1'.
2019-08-09T21:19:12.4447970Z ##[section]Starting: Upload CPU usage statistics
2019-08-09T21:19:12.4452800Z ==============================================================================
2019-08-09T21:19:12.4452920Z Task         : Bash
2019-08-09T21:19:12.4453000Z Description  : Run a Bash script on macOS, Linux, or Windows

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 Aug 9, 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 Aug 9, 2019
@Centril Centril closed this Aug 10, 2019
@Centril Centril deleted the rollup-2k5gn6b branch August 10, 2019 05:15
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
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.

Cleanup: Use #![feature(associated_type_bounds)] where applicable
10 participants