Skip to content

Rollup of 12 pull requests - #58016

Merged
bors merged 36 commits into
rust-lang:masterfrom
Centril:rollup
Jan 31, 2019
Merged

Rollup of 12 pull requests#58016
bors merged 36 commits into
rust-lang:masterfrom
Centril:rollup

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

matthiaskrgrand others added 30 commits December 26, 2018 20:01
The functions return a reference to a new object and do not modify in-place
as the following code shows:
````
let s = String::from(" hello ");
s.trim();
assert_eq!(s, " hello ");
````
The new reference should be bound to a variable as now indicated by #[must_use].
trimmed string is returned as a slice instead of a new allocation
Co-Authored-By: matthiaskrgr <matthias.krueger@famsik.de>
This branch was hit in Clippy and I think it would be nice to
show the thing that was unexpected in the bug message.
It's also in line with the other `bug!` messages in `check_ty`.
The borrow place *must* be a place that we track borrows for, otherwise
we will likely ICE.
…eses-in-match-with-comma, r=oli-obk
suggest `|` when `,` founds in invalid match value
Issue rust-lang#54807
I get stuck on (what | how) I should implement...
Mark str::trim.* functions as #[must_use].
The functions return a reference to a new object and do not modify in-place
as the following code shows:
````
let s = String::from(" hello ");
s.trim();
assert_eq!(s, " hello ");
````
The new reference should be bound to a variable as now indicated by #[must_use].
…mulacrum
use `SOURCE_DATE_EPOCH` for man page time if set
Fixesrust-lang#57776.
…alexcrichton
Introduce into_raw_non_null on Rc and Arc
None
SGX target: improve panic & exit handling
Implement this part of the spec:
> The enclave must not rely on userspace to terminate other threads still running. Similarly, the enclave must not trust that it will no longer be entered by userspace, and it must safeguard against that in the entrypoints.
Also use `UserRef` to access panic buffer
r? @alexcrichton
cc @VardhanThigle
…reavus
Add the edition guide to the bookshelf
…ackmdavis
Improve bug message in check_ty
This branch was hit in Clippy and I think it would be nice to
show the thing that was unexpected in the bug message.
It's also in line with the other `bug!` messages in `check_ty`.
…ichton
Add MOVBE x86 CPU feature
I have no idea if this is correct. I basically copied the ADX feature. I verified the feature is also called `movbe` in LLVM.
I marked this to become stable immediately, as part of the RFC 2045.
r? @alexcrichton
…Manishearth
update docs for fix_start/end_matches
fixesrust-lang#57686:
Don't panic when accessing enum variant ctor using `Self` in match
Fixrust-lang#58006.
r? @petrochenkov
… r=oli-obk
Pass correct arguments to places_conflict
The borrow place *must* be a place that we track borrows for, otherwise
we will likely ICE.
Closesrust-lang#57989
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=12

@bors

bors commented Jan 31, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 877dee7 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 Jan 31, 2019
@bors

bors commented Jan 31, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 877dee7 with merge f40aaa6...

bors added a commit that referenced this pull request Jan 31, 2019
Rollup of 12 pull requests
Successful merges:
- #57008 (suggest `|` when `,` founds in invalid match value)
- #57106 (Mark str::trim.* functions as #[must_use].)
- #57920 (use `SOURCE_DATE_EPOCH` for man page time if set)
- #57934 (Introduce into_raw_non_null on Rc and Arc)
- #57971 (SGX target: improve panic & exit handling)
- #57980 (Add the edition guide to the bookshelf)
- #57984 (Improve bug message in check_ty)
- #57999 (Add MOVBE x86 CPU feature)
- #58000 (Fixes and cleanups)
- #58005 (update docs for fix_start/end_matches)
- #58007 (Don't panic when accessing enum variant ctor using `Self` in match)
- #58008 (Pass correct arguments to places_conflict)
Failed merges:
r? @ghost
@bors

bors commented Jan 31, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing f40aaa6 to master...

@bors
bors merged commit 877dee7 into rust-lang:masterJan 31, 2019
@Centril
Centril deleted the rollup branch January 31, 2019 06:32
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #58016!

Tested on commit f40aaa6.
Direct link to PR: #58016

💔 clippy-driver on windows: test-pass → test-fail (cc @Manishearth@llogiq@mcarton@oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @Manishearth@llogiq@mcarton@oli-obk, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 31, 2019
Tested on commit rust-lang/rust@f40aaa6.
Direct link to PR: <rust-lang/rust#58016>
💔 clippy-driver on windows: test-pass → test-fail (cc @Manishearth@llogiq@mcarton@oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @Manishearth@llogiq@mcarton@oli-obk, @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

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.

12 participants

@Centril@bors@rust-highfive@matthiaskrgr@zackmdavis@euclio@dwijnand@Krout0n@oli-obk@phansch@estebank@matthewjasper