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 #58014

Closed
wants to merge 37 commits into
base: master
from

Conversation

Projects
None yet
@Centril
Copy link
Contributor

Centril commented Jan 30, 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)
  • #57987 (Fix some AArch64 typos)
  • #57999 (Add MOVBE x86 CPU feature)
  • #58000 (Fixes and cleanups)
  • #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

Centril added some commits Jan 30, 2019

Rollup merge of #57980 - siddharthasahu:patch-1, r=QuietMisdreavus
Add the edition guide to the bookshelf
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 #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 30, 2019

@bors r+ p=12

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 30, 2019

📌 Commit 97ac9dd has been approved by Centril

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 30, 2019

⌛️ Testing commit 97ac9dd with merge cc70cf9...

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

Auto merge of #58014 - 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)
 - #57987 (Fix some AArch64 typos)
 - #57999 (Add MOVBE x86 CPU feature)
 - #58000 (Fixes and cleanups)
 - #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 failed - checks-travis

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 31, 2019

The job dist-x86_64-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:02:53]       Memory: 8 GB
[00:02:53]       Boot ROM Version: VMW71.00V.7581552.B64.1801142334
[00:02:53]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:02:53]       SMC Version (system): 2.8f0
[00:02:53]       Serial Number (system): VMc9iw/w8zRA
[00:02:53] 
[00:02:53] hw.ncpu: 4
[00:02:53] hw.byteorder: 1234
[00:02:53] hw.memsize: 8589934592
---
[01:04:48]    Compiling cc v1.0.28
[01:04:48]    Compiling libc v0.2.46
[01:04:48]    Compiling core v0.0.0 (/Users/travis/build/rust-lang/rust/src/libcore)
[01:04:48]    Compiling unwind v0.0.0 (/Users/travis/build/rust-lang/rust/src/libunwind)
[01:04:50] error[E0428]: the name `VaListImpl` is defined multiple times
[01:04:50]   --> src/libcore/ffi.rs:81:1
[01:04:50] 57 |     type VaListImpl;
[01:04:50] 57 |     type VaListImpl;
[01:04:50]    |     ---------------- previous definition of the type `VaListImpl` here
[01:04:50] 81 | struct VaListImpl {
[01:04:50] 81 | struct VaListImpl {
[01:04:50]    | ^^^^^^^^^^^^^^^^^ `VaListImpl` redefined here
[01:04:50]    |
[01:04:50]    = note: `VaListImpl` must be defined only once in the type namespace of this module
[01:04:50] 
[01:04:52] error[E0574]: expected struct, variant or union type, found foreign type `VaListImpl`
[01:04:55]    Compiling compiler_builtins v0.1.5
[01:04:55]    Compiling profiler_builtins v0.0.0 (/Users/travis/build/rust-lang/rust/src/libprofiler_builtins)
[01:04:55]    Compiling backtrace-sys v0.1.27
[01:04:57]    Compiling std v0.0.0 (/Users/travis/build/rust-lang/rust/src/libstd)
[01:04:57]    Compiling std v0.0.0 (/Users/travis/build/rust-lang/rust/src/libstd)
[01:05:02] error[E0308]: intrinsic has wrong type
[01:05:02]    --> src/libcore/ffi.rs:223:5
[01:05:02]     |
[01:05:02] 223 |     fn va_copy(src: &VaList) -> VaListImpl;
[01:05:02]     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected extern type `ffi::::VaListImpl`, found struct `ffi::VaList`
[01:05:02]     |
[01:05:02]     = note: expected type `for<'r, 's> unsafe extern "rust-intrinsic" fn(&'r ffi::VaList<'s>) -> ffi::::VaListImpl`
[01:05:02]                found type `for<'r, 's> unsafe extern "rust-intrinsic" fn(&'r ffi::VaList<'s>) -> ffi::VaList<'s>`
[01:05:08] thread 'rustc' panicked at 'called `Option::unwrap()` on a `None` value', src/libcore/option.rs:345:21
[01:05:08] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:05:11] error: aborting due to 3 previous errors
[01:05:11] 
---
[01:05:11] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[01:05:11] 
[01:05:11] note: rustc 1.34.0-nightly (cc70cf940 2019-01-30) running on x86_64-apple-darwin
[01:05:11] 
[01:05:11] note: compiler flags: -Z save-analysis -Z osx-rpath-install-name -Z force-unstable-if-unmarked -C opt-level=2 -C prefer-dynamic -C linker=/Users/travis/build/rust-lang/rust/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang -C debuginfo=1 -C debug-assertions=n -C codegen-units=1 -C link-args=-Wl,-rpath,@loader_path/../lib --crate-type lib
[01:05:11] note: some of the compiler flags provided by cargo are hidden
[01:05:11] 
[01:05:11] [RUSTC-TIMING] core test:false 23.101
[01:05:11] error: Could not compile `core`.
[01:05:11] error: Could not compile `core`.
[01:05:11] warning: build failed, waiting for other jobs to finish...
[01:05:13] error: build failed
[01:05:13] command did not execute successfully: "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage0/bin/cargo" "build" "--target" "aarch64-apple-ios" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace profiler" "--manifest-path" "/Users/travis/build/rust-lang/rust/src/libstd/Cargo.toml" "--message-format" "json"
[01:05:13] expected success, got: exit code: 101
[01:05:13] failed to run: /Users/travis/build/rust-lang/rust/build/bootstrap/debug/bootstrap build
[01:05:13] Build completed unsuccessfully in 1:01:07
[01:05:13] make: *** [all] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0d44b88e
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Jan 31 01:01:21 GMT 2019
---
travis_fold:start:after_failure.2
travis_time:start:09b96dc9
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
total 0
drwx------+ 15 travis  staff  510 Jan 25  2018 ..
drwx------   2 travis  staff   68 Dec  6  2017 .
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:0f97fe28
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
travis_time:end:0f97fe28:start=1548896488093690000,finish=1548896488123115000,duration=29425000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:16c702e0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:016c3c5b
travis_time:start:016c3c5b
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0547f865
$ dmesg | grep -i kill
$ dmesg | grep -i kill
Unable to obtain kernel buffer: Operation not permitted
usage: sudo dmesg
travis_fold:end:after_failure.6

Done. Your build exited with 1.

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)

@Centril Centril closed this Jan 31, 2019

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

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.