Skip to content

Rollup of 14 pull requests - #62902

Merged
bors merged 40 commits into
rust-lang:masterfrom
Mark-Simulacrum:rollup-mxfk0mm
Jul 23, 2019
Merged

Rollup of 14 pull requests#62902
bors merged 40 commits into
rust-lang:masterfrom
Mark-Simulacrum:rollup-mxfk0mm

Conversation

@Mark-Simulacrum

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

pnkfelixand others added 30 commits July 9, 2019 13:49
At the moment, `rustc_private` as a (library) feature exists by
accident: `char::is_xid_start`, `char::is_xid_continue` methods in
libcore define it.
Co-Authored-By: Ralf Jung <post@ralfj.de>
Fix columns.
… r=oli-obk
more specific errors in src/librustc/mir/interpret/error.rs
Implements [this](rust-lang/const-eval#4)
…-62203-ice, r=varkor
Delay bug to resolve HRTB ICE
Fixrust-lang#62203
… r=eddyb
rustc_typeck: improve diagnostics for _ const/static declarations
This continues rust-lang#62694 and adds type suggestions to const/static declarations with `_` type.
r? @eddyb
Revert "Disable stack probing for gnux32."
This reverts commit 42d652e. (rust-lang#59686)
Closesrust-lang#59674.
move unescape module to rustc_lexer
It makes sense to keep the definition of escape sequences closer to the lexer itself, and it is also a bit of code that I would like to share with rust-analyzer.
r? @petrochenkov
…crum
add rustc_private as a proper language feature gate
At the moment, `rustc_private` as a (library) feature exists by
accident: `char::is_xid_start`, `char::is_xid_continue` methods in
libcore define it.
cc https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/How.20to.20declare.20new.20langauge.20feature.3F
I don't know if this is at all reasonable, but at least tests seem to pass locally. That probably means that we can remove/rename to something more resonable the feature in libcore in the next release?
…_compiler_messages_p14, r=Centril
normalize use of backticks in compiler messages for librustc_allocator
rust-lang#60532
Change "OSX" to "macOS"
Apple no longer uses the OS X branding.
@Mark-Simulacrum

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=5

@bors

bors commented Jul 23, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit c939db7 has been approved by Mark-Simulacrum

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 23, 2019
@bors

bors commented Jul 23, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c939db7 with merge a7f2867...

bors added a commit that referenced this pull request Jul 23, 2019
Rollup of 14 pull requests
Successful merges:
- #60951 (more specific errors in src/librustc/mir/interpret/error.rs)
- #62523 (Delay bug to resolve HRTB ICE)
- #62656 (explain how to search in slice without owned data)
- #62791 (Handle more cases of typos misinterpreted as type ascription)
- #62804 (rustc_typeck: improve diagnostics for _ const/static declarations)
- #62808 (Revert "Disable stack probing for gnux32.")
- #62817 (Tweak span for variant not found error)
- #62842 (Add tests for issue-58887)
- #62851 (move unescape module to rustc_lexer)
- #62859 (Place::as_place_ref is now Place::as_ref)
- #62869 (add rustc_private as a proper language feature gate)
- #62880 (normalize use of backticks in compiler messages for librustc_allocator)
- #62885 (Change "OSX" to "macOS")
- #62889 (Update stage0.txt)
Failed merges:
r? @ghost
@bors

bors commented Jul 23, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing a7f2867 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 23, 2019
@bors
bors merged commit c939db7 into rust-lang:masterJul 23, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #62902!

Tested on commit a7f2867.
Direct link to PR: #62902

💔 miri on windows: test-pass → build-fail (cc @oli-obk@RalfJung@eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk@RalfJung@eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 23, 2019
Tested on commit rust-lang/rust@a7f2867.
Direct link to PR: <rust-lang/rust#62902>
💔 miri on windows: test-pass → build-fail (cc @oli-obk@RalfJung@eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk@RalfJung@eddyb, @rust-lang/infra).
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-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.

15 participants

@Mark-Simulacrum@bors@rust-highfive@Centril@pnkfelix@RalfJung@saleemjaffer@lundibundi@crlf0710@estebank@JohnTitor@matklad@spastorino@atouchet@git-iso