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 14 pull requests #63311

Closed
wants to merge 37 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 6, 2019

Successful merges:

Failed merges:

r? @ghost

timvermeulen and others added 30 commits July 9, 2019 23:38
…dation step

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
…ebank"

This reverts commit df21a6f, reversing
changes made to cc16d04.
Co-Authored-By: Aleksey Kladov <aleksey.kladov@gmail.com>
Co-Authored-By: Aleksey Kladov <aleksey.kladov@gmail.com>
This is just needless indirection.
This is one of the behaviors we no longer allow in NLL. Since it can
lead to undefined behavior, I think it's definitely worth making it a
hard error without waiting to turn off migration mode (rust-lang#58781).

Closes rust-lang#60450.

My ulterior motive here is making it impossible to leave variables
partially initialized across a yield (see discussion at rust-lang#63035), so
tests are included for that.
…scottmcm

Implement DoubleEndedIterator for iter::{StepBy, Peekable, Take}

Now that `DoubleEndedIterator::nth_back` has landed, `StepBy` and `Take` can have an efficient `DoubleEndedIterator` implementation. I don't know if there was any particular reason for `Peekable` not having a `DoubleEndedIterator` implementation, but it's quite trivial and I don't see any drawbacks to having it.

I'm not very happy about the implementation of `Peekable::try_rfold`, but I didn't see another way to only take the value out of `self.peeked` in case `self.iter.try_rfold` didn't exit early.

I only added `Peekable::rfold` (in addition to `try_rfold`) because its `Iterator` implementation has both `fold` and `try_fold` (and for similar reasons I added `Take::try_rfold` but not `Take::rfold`). Do we have any guidelines on whether we want both? If we do want both, maybe we should investigate which iterator adaptors override `try_fold` but not `fold` and add the missing implementations. At the moment I think that it's better to always have iterator adaptors implement both, because some iterators have a simpler `fold` implementation than their `try_fold` implementation.

The tests that I added may not be sufficient because they're all just existing tests where `next`/`nth`/`fold`/`try_fold` are replaced by their DEI counterparts, but I do think all paths are covered. Is there anything in particular that I should probably also test?
Remove special code-path for handing unknown tokens

In `StringReader`, we have a buffer of fatal errors, which is used only in a single case: when we see something which is not a reasonable token at all, like `🦀`. I think a more straightforward thing to do here is to produce an explicit error token in this case, and let the next layer (the parser), deal with it.

However currently this leads to duplicated error messages. What should we do with this? Naively, I would think that emitting (just emitting, not raising) `FatalError` should stop other errors, but looks like this is not the case? We can also probably tweak parser on the case-by-case basis, to avoid emitting "expected" errors if the current token is an `Err`. I personally also fine with cascading errors in this case: it's quite unlikely that you actually type a fully invalid token.

@petrochenkov, which approach should we take to fight cascading errors?
Explaining the reason why validation is performed in to_str of path.rs

I thought it's good to explain the reason for the validation during the conversion between Path/PathBuffer into str, which explains the reason for returning an Option at this point (good for beginners who are reading through the docs).
…ized, r=Centril

Make use of possibly uninitialized data [E0381] a hard error

This is one of the behaviors we no longer allow in NLL. Since it can
lead to undefined behavior, I think it's definitely worth making it a
hard error without waiting to turn off migration mode (rust-lang#58781).

Closes rust-lang#60450.

My ulterior motive here is making it impossible to leave variables
partially initialized across a yield (see rust-lang#60889, discussion at rust-lang#63035), so
tests are included for that.

cc rust-lang#54987

---

I'm not sure if bypassing the buffer is a good way of doing this. We could also make a `force_errors_buffer` or similar that gets recombined with all the errors as they are emitted. But this is simpler and seems fine to me.

r? @Centril
cc @cramertj @nikomatsakis @pnkfelix @RalfJung
diagnostics: Describe crate root modules in `DefKind::Mod` as "crate"

Or we can use "extern crate" like resolve previously did sometimes, not sure.

r? @davidtwco
fix UB in a test

We used to compare two mutable references that were supposed to point to the same thing. That's no good.

Compare them as raw pointers instead.
Centril added 7 commits August 6, 2019 02:23
…rors, r=estebank

Revert "Rollup merge of rust-lang#62696 - chocol4te:fix_#62194, r=estebank"

This reverts commit df21a6f (rust-lang#62696), reversing
changes made to cc16d04.

That PR makes error messages worse than before, and we couldn't come up with a way of actually making them better, so revert it for now. Any idea for making this error message better is welcome!

Fixes rust-lang#63145.

r? @estebank
…chenkov

Some more libsyntax::attr cleanup

Much smaller patch than the last one, mostly just finishing up by removing some Span arguments.

r? @petrochenkov
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.
Don't store &Span

This is just needless indirection.
Clarify align_to's requirements and obligations

Based on discussions with @RalfJung around my misunderstandings when using this.

r? @RalfJung
…=oli-obk

Make qualify consts in_projection use PlaceRef

r? @oli-obk
@Centril
Copy link
Contributor Author

Centril commented Aug 6, 2019

@bors r+ p=14 rollup=never

@bors
Copy link
Contributor

bors commented Aug 6, 2019

📌 Commit a988d59 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 6, 2019
@bors
Copy link
Contributor

bors commented Aug 6, 2019

⌛ Testing commit a988d59 with merge b80e8f1808fe72f12e3561fec517e2079f8043d5...

@bors
Copy link
Contributor

bors commented Aug 6, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job asmjs of your PR failed (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.
2019-08-06T00:27:05.5048473Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-06T00:27:05.5048524Z 
2019-08-06T00:27:05.5048773Z   git checkout -b <new-branch-name>
2019-08-06T00:27:05.5048818Z 
2019-08-06T00:27:05.5049110Z HEAD is now at b80e8f180 Auto merge of #63311 - Centril:rollup-kt4gijw, r=Centril
2019-08-06T00:27:05.5205059Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-06T00:27:05.5208064Z ==============================================================================
2019-08-06T00:27:05.5208175Z Task         : Bash
2019-08-06T00:27:05.5208265Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-06T01:46:11.7959037Z test [ui] ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs ... ok
2019-08-06T01:46:11.8424139Z test [ui] ui/borrowck/borrowck-while-break.rs ... ok
2019-08-06T01:46:11.8824533Z test [ui] ui/borrowck/borrowck-while-cond.rs ... ok
2019-08-06T01:46:11.9314226Z test [ui] ui/borrowck/borrowck-while.rs ... ok
2019-08-06T01:46:11.9681910Z test [ui] ui/borrowck/disallow-possibly-uninitialized.rs ... ok
2019-08-06T01:46:12.0541533Z test [ui] ui/borrowck/index-mut-help-with-impl.rs ... ok
2019-08-06T01:46:12.1130161Z test [ui] ui/borrowck/index-mut-help.rs ... ok
2019-08-06T01:46:12.1466994Z test [ui] ui/borrowck/borrowck-use-mut-borrow-rpass.rs ... ok
2019-08-06T01:46:12.2012223Z test [ui] ui/borrowck/issue-27282-mutation-in-guard.rs ... ok
---
2019-08-06T02:32:00.2148131Z 
2019-08-06T02:32:00.2148553Z ---- [ui] ui/issues/issue-37433.rs stdout ----
2019-08-06T02:32:00.2148635Z diff of stderr:
2019-08-06T02:32:00.2148668Z 
2019-08-06T02:32:00.2148897Z - error[E0669]: invalid value for constraint in inline assembly
2019-08-06T02:32:00.2149154Z -   --> $DIR/issue-37433.rs:5:24
2019-08-06T02:32:00.2149217Z + error[E0472]: asm! is unsupported on this target
2019-08-06T02:32:00.2149450Z +   --> $DIR/issue-37433.rs:5:9
2019-08-06T02:32:00.2149505Z 3    |
2019-08-06T02:32:00.2149565Z 4 LL |         asm!("" :: "r"(""));
2019-08-06T02:32:00.2178535Z +    |         ^^^^^^^^^^^^^^^^^^^^
2019-08-06T02:32:00.2178791Z 6 
2019-08-06T02:32:00.2179015Z 7 error: aborting due to previous error
2019-08-06T02:32:00.2179078Z 8 
2019-08-06T02:32:00.2179078Z 8 
2019-08-06T02:32:00.2179285Z 
2019-08-06T02:32:00.2179312Z 
2019-08-06T02:32:00.2179545Z The actual stderr differed from the expected stderr.
2019-08-06T02:32:00.2179845Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-37433/issue-37433.stderr
2019-08-06T02:32:00.2180095Z To update references, rerun the tests and pass the `--bless` flag
2019-08-06T02:32:00.2180344Z To only update this specific test, also pass `--test-args issues/issue-37433.rs`
2019-08-06T02:32:00.2180442Z error: 1 errors occurred comparing output.
2019-08-06T02:32:00.2180504Z status: exit code: 1
2019-08-06T02:32:00.2180504Z status: exit code: 1
2019-08-06T02:32:00.2181380Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-37433.rs" "-Zthreads=1" "--target=asmjs-unknown-emscripten" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-37433" "-Crpath" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/asmjs-unknown-emscripten/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-37433/auxiliary" "-A" "unused"
2019-08-06T02:32:00.2181919Z ------------------------------------------
2019-08-06T02:32:00.2181959Z 
2019-08-06T02:32:00.2182177Z ------------------------------------------
2019-08-06T02:32:00.2182231Z stderr:
2019-08-06T02:32:00.2182231Z stderr:
2019-08-06T02:32:00.2182432Z ------------------------------------------
2019-08-06T02:32:00.2182493Z error[E0472]: asm! is unsupported on this target
2019-08-06T02:32:00.2183072Z   --> /checkout/src/test/ui/issues/issue-37433.rs:5:9
2019-08-06T02:32:00.2183321Z    |
2019-08-06T02:32:00.2183394Z LL |         asm!("" :: "r"(""));
2019-08-06T02:32:00.2183524Z 
2019-08-06T02:32:00.2183584Z error: aborting due to previous error
2019-08-06T02:32:00.2183633Z 
2019-08-06T02:32:00.2183676Z 
---
2019-08-06T02:32:00.2188637Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-08-06T02:32:00.2188715Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-08-06T02:32:00.2207650Z 
2019-08-06T02:32:00.2207907Z 
2019-08-06T02:32:00.2209965Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-asmjs-unknown-emscripten" "--mode" "ui" "--target" "asmjs-unknown-emscripten" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--nodejs" "/emsdk-portable/node/8.9.1_64bit/bin/node" "--host-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/asmjs-unknown-emscripten/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "9.0.0-rust-1.38.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-08-06T02:32:00.2210700Z 
2019-08-06T02:32:00.2210734Z 
2019-08-06T02:32:00.2216041Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target asmjs-unknown-emscripten src/test/ui src/test/run-fail src/libstd src/liballoc src/libcore
2019-08-06T02:32:00.2216684Z Build completed unsuccessfully in 1:59:41
2019-08-06T02:32:00.2216684Z Build completed unsuccessfully in 1:59:41
2019-08-06T02:32:01.0504323Z ##[error]Bash exited with code '1'.
2019-08-06T02:32:01.0547822Z ##[section]Starting: Upload CPU usage statistics
2019-08-06T02:32:01.0557478Z ==============================================================================
2019-08-06T02:32:01.0557591Z Task         : Bash
2019-08-06T02:32:01.0557662Z Description  : Run a Bash script on macOS, Linux, or Windows

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)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 6, 2019
@Centril Centril closed this Aug 6, 2019
@Centril Centril deleted the rollup-kt4gijw branch August 6, 2019 02:38
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.