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 12 pull requests #58016

Merged
merged 36 commits into from Jan 31, 2019

Conversation

Projects
None yet
@Centril
Copy link
Contributor

Centril commented Jan 31, 2019

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

matthiaskrgr and others added some commits Dec 24, 2018

mark str::string::String.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].
Update src/libcore/str/mod.rs, tweak must_use message
trimmed string is returned as a slice instead of a new allocation

Co-Authored-By: matthiaskrgr <matthias.krueger@famsik.de>
Jethro Beekman
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`.
Pass correct arguments to places_conflict
The borrow place *must* be a place that we track borrows for, otherwise
we will likely ICE.
Rollup merge of #57008 - Knium:misleading-try-adding-parentheses-in-m…
…atch-with-comma, r=oli-obk

suggest `|` when `,` founds in invalid match value

Issue #54807
I get stuck on (what | how) I should implement...
Rollup merge of #57106 - matthiaskrgr:trim_must_use, r=sfackler
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].
Rollup merge of #57920 - euclio:source-date-epoch, r=Mark-Simulacrum
use `SOURCE_DATE_EPOCH` for man page time if set

Fixes #57776.
Rollup merge of #57934 - dwijnand:from-Arc/Rc-to-NonNull, r=alexcrichton
Introduce into_raw_non_null on Rc and Arc

None
Rollup merge of #57971 - jethrogb:jb/sgx-panic, r=alexcrichton
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
Rollup merge of #57980 - siddharthasahu:patch-1, r=QuietMisdreavus
Add the edition guide to the bookshelf

Centril added some commits Jan 31, 2019

Rollup merge of #57984 - phansch:improve_check_ty_error, r=zackmdavis
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`.
Rollup merge of #57999 - jethrogb:jb/movbe-feature, r=alexcrichton
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
Rollup merge of #58005 - vitiral:docs_trim_start_matches, r=Manishearth
update docs for fix_start/end_matches

fixes #57686:
Rollup merge of #58007 - estebank:issue-58006, r=petrochenkov
Don't panic when accessing enum variant ctor using `Self` in match

Fix #58006.

r? @petrochenkov
Rollup merge of #58008 - matthewjasper:places-conflict-args, 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.

Closes #57989
@Centril

This comment has been minimized.

Copy link
Contributor Author

Centril commented Jan 31, 2019

@bors r+ p=12

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 31, 2019

📌 Commit 877dee7 has been approved by Centril

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 31, 2019

⌛️ Testing commit 877dee7 with merge f40aaa6...

bors added a commit that referenced this pull request Jan 31, 2019

Auto merge of #58016 - Centril:rollup, r=Centril
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

This comment has been minimized.

Copy link
Contributor

bors commented Jan 31, 2019

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

@bors bors merged commit 877dee7 into rust-lang:master Jan 31, 2019

1 check passed

homu Test successful
Details

@Centril Centril deleted the Centril:rollup branch Jan 31, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 31, 2019

📣 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

📣 Toolstate changed by rust-lang/rust#58016!
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).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.