Skip to content

Rollup of 9 pull requests - #67060

Merged
bors merged 23 commits into
rust-lang:masterfrom
Centril:rollup-hwhdx4h
Dec 6, 2019
Merged

Rollup of 9 pull requests#67060
bors merged 23 commits into
rust-lang:masterfrom
Centril:rollup-hwhdx4h

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

osa1and others added 23 commits December 3, 2019 11:16
When refering to or suggesting raw identifiers, refer to them with `r#`.
Fixrust-lang#65634.
In most places, we use a span when emitting `expected...found` errors.
However, there were a couple of places where we didn't use any span,
resulting in hard-to-interpret error messages.
This commit attaches the relevant span to these notes, and additionally
switches over to using `note_expected_found` instead of manually
formatting the message
the unstables ones in libcore, with the unstable feature disabled, were not checked
So that we can bootstrap successfully
Clarify it is OK to pass a pointer that never owned a weak count (one
from Weak::new) back into it as it was created from it. Relates to
discussion in rust-lang#60728.
…tolnay
weak-into-raw: Clarify some details in Safety
Clarify it is OK to pass a pointer that never owned a weak count (one
from Weak::new) back into it as it was created from it. Relates to
discussion in rust-lang#60728.
@CAD97 Do you want to have a look at the new docs?
Check break target availability when checking breaks with values
Fixesrust-lang#66702
I'll be adding a regression test.
Fix documentation of pattern for str::matches()
Made it the same as rmatches()
Accurately portray raw identifiers in error messages
When refering to or suggesting raw identifiers, refer to them with `r#`.
Fixrust-lang#65634.
…r=Dylan-DPC
Include a span in more `expected...found` notes
In most places, we use a span when emitting `expected...found` errors.
However, there were a couple of places where we didn't use any span,
resulting in hard-to-interpret error messages.
This commit attaches the relevant span to these notes, and additionally
switches over to using `note_expected_found` instead of manually
formatting the message
E0023: handle expected != tuple pattern type
Fixesrust-lang#67037.
r? @estebank
…-Simulacrum
rustc_parser: cleanup imports
Reorganize & canonicalize some imports + Drop `rustc_target` as a dependency.
r? @Mark-Simulacrum
Make const-qualification look at more `const fn`s
As explained in a lot more detail in rust-lang#67053 this makes const-qualification not ignore the unstable const fns in libcore.
r? @oli-obk cc @ecstatic-morse
(Still a bit unsure about the `cfg`s here, for bootstrapping, does that seem correct ?)
Fixesrust-lang#67053.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=9 rollup=never

@bors

bors commented Dec 5, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit a008aff has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 5, 2019
@CentrilCentril added rollup A PR which is a rollup 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 5, 2019
@bors

bors commented Dec 5, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a008aff with merge f6840f3...

bors added a commit that referenced this pull request Dec 5, 2019
Rollup of 9 pull requests
Successful merges:
- #66710 (weak-into-raw: Clarify some details in Safety)
- #66863 (Check break target availability when checking breaks with values)
- #67002 (Fix documentation of pattern for str::matches())
- #67005 (capitalize Rust)
- #67010 (Accurately portray raw identifiers in error messages)
- #67011 (Include a span in more `expected...found` notes)
- #67044 (E0023: handle expected != tuple pattern type)
- #67045 (rustc_parser: cleanup imports)
- #67055 (Make const-qualification look at more `const fn`s)
Failed merges:
r? @ghost
@bors

bors commented Dec 6, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing f6840f3 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 6, 2019
@bors
bors merged commit a008aff into rust-lang:masterDec 6, 2019
@Centril
Centril deleted the rollup-hwhdx4h branch December 6, 2019 16:14
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.

8 participants

@Centril@bors@osa1@JayXon@estebank@Aaron1011@lqd@vorner