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 9 pull requests #53620

Closed
wants to merge 30 commits into from

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

varkor and others added 30 commits August 14, 2018 21:08
(Not `Try` since `QuestionMark` is using that.)
I ignored the code block as I didn't see a way to run the doctest in 2018 -- I noticed the edition guide is also not testing its 2018 code snippits.
This makes it more like `AllSets::{gen,kill}_set`, removes the need for
a bunch of bitset range computations, and removes the need for `Bits`.

It's marginally less efficient, because we have to allocate one bitset
per basic block instead of one large shared bitset, but the difference
is negligible in practice.
The `Buf` vs. non-`Buf` distinction is no longer necessary, and the
nastiest code in this file can be removed.

To minimize this patch, `IdxSet` is made a typedef of `IdxSetBuf`. The
next patch will remove this typedef.
Now that the `Buf` vs. non-`Buf` distinction has been removed, it makes
sense to drop the `Buf` suffix and use the shorter names everywhere.
…ine with other descriptions.

add ticks around a few keywords in other descriptions.
`tool_attributes`, `proc_macro_path_invoc`, partially `proc_macro_gen`
Previously approved in rust-lang#43498 ; update tidy to match.
Implement try block expressions

I noticed that `try` wasn't a keyword yet in Rust 2018, so...

~~Fix​es rust-lang#52604 That was fixed by PR rust-lang#53135
cc rust-lang#31436 rust-lang#50412
Feature gate where clauses on associated type impls

Fixes rust-lang#52913. This doesn't address the core problem, which is tracked by rust-lang#47206. However, it fixes the stable-to-stable regression: you now have to enable `#![feature(generic_associated_types)]` to trigger the weird behaviour.
Stabilize a few secondary macro features

- `tool_attributes` - closes rust-lang#44690
- `proc_macro_path_invoc` - this feature was created due to issues with tool attributes (rust-lang#51277), those issues are now fixed (rust-lang#52841)
- partially `proc_macro_gen` - this feature was created due to issue rust-lang#50504, the issue is now fixed (rust-lang#51952), so proc macros can generate modules. They still can't generate `macro_rules` items though due to unclear hygiene interactions.
… r=nikomatsakis

Merge `IdxSet` and `IdxSetBuf`

Because it simplifies things.

@r? nikomatsakis
…nagisa

Lament the invincibility of the Turbofish

Here a test case is added to ensure that any others attempting to drive the Turbofish to extinction have second thoughts. Previously the [entire test suite would succeed](rust-lang#53511) if generic arguments were accepted without disambiguation, making for [confusing and heartbreaking circumstances](rust-lang/rfcs#2527).
docs: minor stylistic changes to str/string docs

std::string::String.repeat(): slightly rephrase to be more in-line with other descriptions.

add ticks around a few keywords in other descriptions.
Fix a grammatical mistake in "expected generic arguments" errors

r? @eddyb
…, r=Mark-Simulacrum

tidy: Stop requiring a license header

Previously approved in rust-lang#43498 ; update tidy to match.
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=5

@bors
Copy link
Contributor

bors commented Aug 22, 2018

📌 Commit df0a576 has been approved by Mark-Simulacrum

@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 22, 2018
@bors
Copy link
Contributor

bors commented Aug 23, 2018

⌛ Testing commit df0a576 with merge f87d5bc56462b32fefd28a36384dca48c30aefd5...

@bors
Copy link
Contributor

bors commented Aug 23, 2018

💔 Test failed - status-travis

@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 23, 2018
@rust-highfive
Copy link
Collaborator

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
Copy link
Member

kennytm commented Aug 23, 2018

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
Copy link
Contributor

bors commented Aug 23, 2018

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

@kennytm kennytm closed this Aug 23, 2018
@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.