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 18 pull requests #74308

Closed
wants to merge 81 commits into from

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

Lucretiel and others added 30 commits May 31, 2020 00:10
This commit redesigns LineWriter to work more directly on the internals
of BufWriter. This interface change is to enable a future Pull Request
in which Stdout can be switched between Line and Block buffered mode.
- Added a bunch of new unit tests
- Removed test_line_buffer_fail_flush
- Updated erroneous_flush_retried
- Added helper methods to LineWriterShim for code clarity, to distinguish "self.buffer" (the BufWriter) from self.inner (the thing wrapped by the BufWriter)
- Un-expressionized write & write_all
- Added clause to bail early on Ok(0)
- Cleaned up BufWriter::seek
- Updated line_vectored test
- Updated line_vectored_partial_and_errors test
- Added several new tests
- Renamed write_to_buffer to write_to_buf, for consistency
- Fixed references to flush_buf
- Optimized `write` to use one less `memchr` call
- Fixed test after write_vectored bugfix
- Some comments
- Fixed partial-line buffering issue
- Added tests

Thanks @the8472 for catching!
don't mark linux kernel module targets as a unix environment

refs rust-lang#74247

r?@joshtriplett

cc: @ehuss
…acrum

Slight reorganization of sys/(fast_)thread_local

I was long confused by the `thread_local` and `fast_thread_local` modules in the `sys(_common)` part of libstd. The names make it *sound* like `fast_thread_local` is just a faster version of `thread_local`, but really these are totally different APIs: one provides thread-local "keys", which are non-addressable pointer-sized pieces of local storage with an associated destructor; the other (the "fast" one) provides just a destructor.

So I propose we rename `fast_thread_local` to `thread_local_dtor`, and `thread_local` to `thread_local_key`. That's what this PR does.
…der-type-error, r=estebank

typeck: report placeholder type error w/out span

Fixes rust-lang#74086.

This PR fixes a regression introduced in rust-lang#70369 which meant that an error was not being emitted for invalid placeholder types when there wasn't a span available.

r? @estebank
rust-lang#71669: add ui, codegen tests for volatile + nearby int intrinsics

Added some tests for intrinsics. See rust-lang#71669.
…Gomez

Added detailed error code explanation for issue E0688 in Rust compiler.

Added proper error explanation for issue E0688 in the Rust compiler.
Error Code E0688

Sub Part of Issue rust-lang#61137

r? @GuillaumeGomez
@Manishearth
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jul 13, 2020

📌 Commit 2f20d96 has been approved by Manishearth

@rustbot rustbot added the rollup A PR which is a rollup label Jul 13, 2020
@bors
Copy link
Contributor

bors commented Jul 13, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@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 Jul 13, 2020
@bors
Copy link
Contributor

bors commented Jul 13, 2020

⌛ Testing commit 2f20d96 with merge b2dd47473172079861e20c3a18af79fbad7ef826...

@bors
Copy link
Contributor

bors commented Jul 14, 2020

💔 Test failed - checks-actions

@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 Jul 14, 2020
@Manishearth
Copy link
Member Author

2020-07-14T00:00:54.8395865Z ---- [ui] ui/rfcs/rfc-1014.rs stdout ----
2020-07-14T00:00:54.8396030Z 
2020-07-14T00:00:54.8396165Z error: test run failed!
2020-07-14T00:00:54.8396300Z status: exit code: 101
2020-07-14T00:00:54.8401953Z command: "/emsdk-portable/node/latest/bin/node" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/rfcs/rfc-1014/a.js"
2020-07-14T00:00:54.8402191Z stdout:
2020-07-14T00:00:54.8402533Z ------------------------------------------
2020-07-14T00:00:54.8402615Z 
2020-07-14T00:00:54.8402898Z ------------------------------------------
2020-07-14T00:00:54.8403043Z stderr:
2020-07-14T00:00:54.8403324Z ------------------------------------------
2020-07-14T00:00:54.8403727Z thread 'main' panicked at 'failed printing to stdout: Bad file descriptor (os error 9)', src/libstd/io/stdio.rs:955:9
2020-07-14T00:00:54.8407643Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-07-14T00:00:54.8408046Z 
2020-07-14T00:00:54.8408714Z ------------------------------------------
2020-07-14T00:00:54.8408812Z 
2020-07-14T00:00:54.8408897Z 
2020-07-14T00:00:54.8408978Z 
2020-07-14T00:00:54.8409109Z failures:
2020-07-14T00:00:54.8409401Z     [ui] ui/rfcs/rfc-1014.rs
2020-07-14T00:00:54.8409477Z 
2020-07-14T00:00:54.8409848Z 

@Manishearth
Copy link
Member Author

@bors retry

seems like stdout closed unexpectedly

@bors bors added 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 14, 2020
@bors
Copy link
Contributor

bors commented Jul 14, 2020

⌛ Testing commit 2f20d96 with merge fb83e6869d24e4a19a8ff4fb8ad5a11066360031...

@bors
Copy link
Contributor

bors commented Jul 14, 2020

💔 Test failed - checks-actions

@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 Jul 14, 2020
@Manishearth
Copy link
Member Author

Same bug. That test is actually testing stdout stuff, and it's failing consistently on wasm

@Manishearth
Copy link
Member Author

That test shouldn't run at all

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.