Rollup of 9 pull requests

[Mark-Simulacrum]

Successful merges:

• Implement try block expressions #52602 (Implement try block expressions)
• Feature gate where clauses on associated type impls #53235 (Feature gate where clauses on associated type impls)
• Stabilize a few secondary macro features #53459 (Stabilize a few secondary macro features)
• Merge IdxSet and IdxSetBuf #53520 (Merge IdxSet and IdxSetBuf)
• Lament the invincibility of the Turbofish #53562 (Lament the invincibility of the Turbofish)
• docs: minor stylistic changes to str/string docs #53592 (docs: minor stylistic changes to str/string docs)
• Update RELEASES.md to include clippy-preview #53594 (Update RELEASES.md to include clippy-preview)
• Fix a grammatical mistake in "expected generic arguments" errors #53600 (Fix a grammatical mistake in "expected generic arguments" errors)
• tidy: Stop requiring a license header #53617 (tidy: Stop requiring a license header)

Failed merges:

r? @ghost

[Mark-Simulacrum]

@bors r+ p=5

[bors]

📌 Commit df0a576 has been approved by Mark-Simulacrum

[bors]

⌛ Testing commit df0a576 with merge f87d5bc56462b32fefd28a36384dca48c30aefd5...

[bors]

💔 Test failed - status-travis

[rust-highfive]

The job dist-i686-apple of your PR failed on Travis (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.

[00:03:47] Memory: 8 GB
[00:03:47] Boot ROM Version: VMW71.00V.0.B64.1704110547
[00:03:47] Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:47] SMC Version (system): 2.8f0
[00:03:47] Serial Number (system): VMZxAZIpVqGX
[00:03:47] [00:03:47] hw.ncpu: 4
[00:03:47] hw.byteorder: 1234
[00:03:47] hw.memsize: 8589934592
---
Building stage2 tool miri (i686-apple-darwin)
[01:12:31] Compiling miri v0.1.0 (file:///Users/travis/build/rust-lang/rust/src/tools/miri)
[01:12:31] Compiling byteorder v1.2.3
[01:12:32] [RUSTC-TIMING] byteorder test:false 0.872
[01:12:32] error: found removed `do catch` syntax
[01:12:32] |
[01:12:32] |
[01:12:32] 639 | let res: EvalResult<'tcx> = do catch {
[01:12:32] |
[01:12:32] |
[01:12:32] = help: Following RFC #2388, the new non-placeholder syntax is `try`
[01:12:32] [01:12:32] error: found removed `do catch` syntax
[01:12:32] |
[01:12:32] |
[01:12:32] 253 | let res: EvalResult = do catch {
[01:12:32] |
[01:12:32] |
[01:12:32] = help: Following RFC #2388, the new non-placeholder syntax is `try`
[01:12:33] error[E0432]: unresolved import `syntax::codemap`
[01:12:33] --> tools/miri/src/lib.rs:33:13
[01:12:33] |
[01:12:33] 33 | use syntax::codemap::Span;
---
[01:12:34] [01:12:34] error[E0423]: expected value, found struct variant `$crate::mir::interpret::EvalErrorKind::Panic`
[01:12:34] --> tools/miri/src/fn_call.rs:736:50
[01:12:34] |
[01:12:34] 736 | "std::rt::begin_panic_fmt" => return err!(Panic),
[01:12:34] | ^^^^^^^^^^^ did you mean `$crate::mir::interpret::EvalErrorKind::Panic { /* fields */ }`?
[01:12:34] = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[01:12:34] [01:12:34] error[E0531]: cannot find unit struct/variant or constant `TyBool` in module `ty`
[01:12:34] --> tools/miri/src/validation.rs:387:17
---
[01:12:34] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[01:12:34] |
[01:12:34] = note: #[warn(unused_imports)] on by default
[01:12:34] [01:12:34] warning: unused import: `Instance`
[01:12:34] |
[01:12:34] |
[01:12:34] 5 | use rustc::ty::{self, Ty, TypeFoldable, TyCtxt, Instance};
[01:12:34] [01:12:34] warning: unused import: `ConstValue`
[01:12:34] --> tools/miri/src/validation.rs:11:29
[01:12:34] |
---
[01:12:34] [01:12:34] warning: unused import: `rustc::ty::AdtKind`
[01:12:34] --> tools/miri/src/validation.rs:535:13
[01:12:34] |
[01:12:34] 535 | use rustc::ty::AdtKind;
[01:12:34] [01:12:34] [01:12:34] warning: unused import: `tls::EvalContextExt as TlsEvalContextExt`
[01:12:34] |
[01:12:34] |
[01:12:34] 54 | use tls::EvalContextExt as TlsEvalContextExt;
[01:12:34] [01:12:34] error[E0050]: method `eval_fn_call` has 6 parameters but the declaration in trait `rustc_mir::interpret::Machine::eval_fn_call` has 5
[01:12:34] --> tools/miri/src/lib.rs:398:14
[01:12:34] |
---
travis_fold:start:dpl_0
travis_time:start:17f64e54
$ rvm $(travis_internal_ruby) --fuzzy do ruby -S gem install dpl
ERROR: While executing gem ... (Gem::RemoteFetcher::UnknownHostError)
no such name (https://api.rubygems.org/quick/Marshal.4.8/dpl-1.10.0.gemspec.rz)
The command "rvm $(travis_internal_ruby) --fuzzy do ruby -S gem install dpl" failed and exited with 1 during .
Your build has been stopped.

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)

[kennytm]

The error is spurious

ERROR: While executing gem ... (Gem::RemoteFetcher::UnknownHostError)
no such name (https://api.rubygems.org/quick/Marshal.4.8/dpl-1.10.0.gemspec.rz)

but #53520 is already testing. Not retrying.

[bors]

☔ The latest upstream changes (presumably #53459) made this pull request unmergeable. Please resolve the merge conflicts.