Rollup of 17 pull requests#74306

Manishearth · 2020-07-13T22:12:12Z

Successful merges:

Substantial refactor to the design of LineWriter #72808 (Substantial refactor to the design of LineWriter)
Update RELEASES.md for 1.45.0 #73354 (Update RELEASES.md for 1.45.0)
rustdoc: insert newlines between attributes #73852 (rustdoc: insert newlines between attributes)
Document the union keyword #73867 (Document the union keyword)
add (unchecked) indexing methods to raw (and NonNull) slices #73986 (add (unchecked) indexing methods to raw (and NonNull) slices)
Fix caching issue when building tools. #74046 (Fix caching issue when building tools.)
clean up E0718 explanation #74123 (clean up E0718 explanation)
rustdoc: Allow linking from private items to private types #74147 (rustdoc: Allow linking from private items to private types)
Detect tuple struct incorrectly used as struct pat #74173 (Detect tuple struct incorrectly used as struct pat)
Don't panic if the lhs of a div by zero is not statically known #74221 (Don't panic if the lhs of a div by zero is not statically known)
Remove an unwrap in layout computation #74227 (Remove an unwrap in layout computation)
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit #74239 (Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit )
Teach bootstrap about target files vs target triples #74251 (Teach bootstrap about target files vs target triples)
don't mark linux kernel module targets as a unix environment #74257 (don't mark linux kernel module targets as a unix environment)
typeck: report placeholder type error w/out span #74270 (typeck: report placeholder type error w/out span)
#71669: add ui, codegen tests for volatile + nearby int intrinsics #74285 (Missing tests for intrinsics. #71669: add ui, codegen tests for volatile + nearby int intrinsics)
Added detailed error code explanation for issue E0688 in Rust compiler. #74286 (Added detailed error code explanation for issue E0688 in Rust compiler.)

Failed merges:

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

@the8472

- Fixed partial-line buffering issue - Added tests Thanks @the8472 for catching!

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

Remove an unwrap in layout computation A tiny improvement.

Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit which includes LVI segfault fix when building fortanix/rust-sgx#267 And a few earlier commits.

…r=Mark-Simulacrum Teach bootstrap about target files vs target triples `rustc` allows passing in predefined target triples as well as JSON target specification files. This change allows bootstrap to have the first inkling about those differences. This allows building a cross-compiler for an out-of-tree architecture (even though that compiler won't work for other reasons). Even if no one ever uses this functionality, I think the newtype around the `Interned<String>` improves the readability of the code.

@joshtriplett

don't mark linux kernel module targets as a unix environment refs rust-lang#74247 r?@joshtriplett cc: @ehuss

@estebank

…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.

@GuillaumeGomez

…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 · 2020-07-13T22:17:32Z

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

bors · 2020-07-13T22:17:33Z

📌 Commit b4ce62b has been approved by Manishearth

bors · 2020-07-13T22:17:34Z

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

bors · 2020-07-13T22:17:48Z

⌛ Testing commit b4ce62b with merge e356933ec2afb7e0bb8ef5e4b39d1840bead9b81...

bors · 2020-07-13T22:52:15Z

💔 Test failed - checks-actions

eddyb · 2020-07-13T22:53:27Z

@bors retry

bors · 2020-07-13T22:53:41Z

⌛ Testing commit b4ce62b with merge db87c93df2f58b6803d43d3aff330075c1996d1e...

eddyb · 2020-07-13T23:16:48Z

Huh, this is what ended up on the PR CI, although this passed on the wasm builder (which failed for an unrelated reason):

---- [ui] ui/const_prop/ice-assert-fail-div-by-zero.rs stdout ----
diff of stderr:

-	warning: this operation will panic at runtime
-	  --> $DIR/ice-assert-fail-div-by-zero.rs:10:5
-	   |
-	LL |     f.0 / 0;
-	   |     ^^^^^^^ attempt to divide _ by zero
-	   |
-	note: the lint level is defined here
-	  --> $DIR/ice-assert-fail-div-by-zero.rs:5:9
-	   |
-	LL | #![warn(unconditional_panic)]
-	   |         ^^^^^^^^^^^^^^^^^^^
-	
-	warning: 1 warning emitted
-	
-

bors · 2020-07-13T23:23:27Z

💔 Test failed - checks-actions

Manishearth · 2020-07-13T23:24:18Z

2020-07-13T23:22:10.3748407Z 
2020-07-13T23:22:10.3748573Z failures:
2020-07-13T23:22:10.3827523Z 
2020-07-13T23:22:10.3828420Z ---- [ui] ui/const_prop/ice-assert-fail-div-by-zero.rs stdout ----
2020-07-13T23:22:10.3828644Z diff of stderr:
2020-07-13T23:22:10.3829719Z 
2020-07-13T23:22:10.3830841Z -	warning: this operation will panic at runtime
2020-07-13T23:22:10.3831207Z -	  --> $DIR/ice-assert-fail-div-by-zero.rs:10:5
2020-07-13T23:22:10.3831477Z -	   |
2020-07-13T23:22:10.3831741Z -	LL |     f.0 / 0;
2020-07-13T23:22:10.3832086Z -	   |     ^^^^^^^ attempt to divide _ by zero
2020-07-13T23:22:10.3832348Z -	   |
2020-07-13T23:22:10.3832632Z -	note: the lint level is defined here
2020-07-13T23:22:10.3832948Z -	  --> $DIR/ice-assert-fail-div-by-zero.rs:5:9
2020-07-13T23:22:10.3833209Z -	   |
2020-07-13T23:22:10.3833490Z -	LL | #![warn(unconditional_panic)]
2020-07-13T23:22:10.3833802Z -	   |         ^^^^^^^^^^^^^^^^^^^
2020-07-13T23:22:10.3834058Z -	
2020-07-13T23:22:10.3834333Z -	warning: 1 warning emitted
2020-07-13T23:22:10.3834827Z -

Lucretiel and others added 30 commits May 31, 2020 00:10

Substantial refactor to the design of LineWriter

37570e8

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.

Updated comments; only pre-flush newline terminated buffers

0f38158

Expressionify LineWriterShim::write

4a1597f

Expressionify write_all

5edad37

x.py fmt

1bf8ba3

Added check for is_write_vectored

e0dfdc6

Add comment describing erroneous_flush_retried

2c3024b

Added test stubs

e89e2e4

Tons of testing updates, other minor changes

b6296e8

- Cleaned up BufWriter::seek - Updated line_vectored test - Updated line_vectored_partial_and_errors test - Added several new tests

Fixed typo in test

e022d34

Code review updates: all minor style fixes

e4328ae

- Renamed write_to_buffer to write_to_buf, for consistency - Fixed references to flush_buf - Optimized `write` to use one less `memchr` call

Add comment

f7650fe

Tidy fixes

7a6a12b

Reimplement flush_buf with a Guard. Longer, but cleaner.

338a2c0

Added comment about BufWrite::write_all

c869638

Improved line_vectored_ignored. Added stylistic semicolon.

61f591e

Fixed bug in write_vectored & empty buffers

2d22c77

Comment updates

2c23b90

Remove inline from write_to_buf

e999ca5

More minor changes

70ba320

- Fixed test after write_vectored bugfix - Some comments

BufWriter::write* methods now use fewer runtime checks

5b1a40c

x.py fix AGAIN

8df5ae0

Fixed corner case related to partial-line buffering

60ab99f

- Fixed partial-line buffering issue - Added tests Thanks @the8472 for catching!

Update comments with relevant issue numbers

38017a3

Clarified comment in partial_multiline_buffering test

59710fb

Document the union keyword

2e21af2

Clarify some parts by applying the suggestions from review

614f773

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

Fix caching issue when building tools.

310c97b

add as_ptr method to raw slices

c478b54

Manishearth added 7 commits July 13, 2020 15:11

Rollup merge of rust-lang#74227 - erikdesjardins:layun, r=estebank

70790e0

Remove an unwrap in layout computation A tiny improvement.

Rollup merge of rust-lang#74239 - AdrianCX:master, r=cuviper

8ed197f

Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit which includes LVI segfault fix when building fortanix/rust-sgx#267 And a few earlier commits.

Rollup merge of rust-lang#74257 - alex:patch-1, r=joshtriplett

723a4af

don't mark linux kernel module targets as a unix environment refs rust-lang#74247 r?@joshtriplett cc: @ehuss

Rollup merge of rust-lang#74285 - wangtheo:issue-71669, r=lcnr

8cdd92d

rust-lang#71669: add ui, codegen tests for volatile + nearby int intrinsics Added some tests for intrinsics. See rust-lang#71669.

rustbot added the rollup A PR which is a rollup label Jul 13, 2020

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 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 13, 2020

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 13, 2020

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 13, 2020

Manishearth mentioned this pull request Jul 13, 2020

Don't panic if the lhs of a div by zero is not statically known #74221

Merged

Manishearth closed this Jul 13, 2020

Manishearth deleted the rollup-4wq5fu9 branch July 18, 2020 01:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 17 pull requests#74306