Rollup of 20 pull requests #55912

kennytm · 2018-11-13T05:03:27Z

Successful merges:

Remove short doc where it starts with a codeblock #55136 (Remove short doc where it starts with a codeblock)
Format BtreeMap::range_mut example #55711 (Format BtreeMap::range_mut example)
impl_stable_hash_for: support enums and tuple structs with generic parameters #55722 (impl_stable_hash_for: support enums and tuple structs with generic parameters)
Avoid converting bytes to UTF-8 strings to print, just pass bytes to stdout/err #55754 (Avoid converting bytes to UTF-8 strings to print, just pass bytes to stdout/err)
rustdoc: don't inline pub use some_crate unless directly asked to #55804 (rustdoc: don't inline pub use some_crate unless directly asked to)
Move static_assert! into librustc_data_structures #55805 (Move static_assert! into librustc_data_structures)
Make PhantomData #[structural_match] #55837 (Make PhantomData #[structural_match])
Fix TLS errors when downloading stage0 #55840 (Fix TLS errors when downloading stage0)
add FromIterator<A> to Box<[A]> #55843 (add FromIterator to Box<[A]>)
Small fixes on code blocks in rustdoc #55858 (Small fixes on code blocks in rustdoc)
Fix a typo in std::panic #55863 (Fix a typo in std::panic)
Fix typos. #55870 (Fix typos.)
string: Add documentation for From impls #55874 (string: Add documentation for From impls)
save-analysis: Don't panic for macro-generated use globs #55879 (save-analysis: Don't panic for macro-generated use globs)
Reference count crate_inherent_implss return value. #55882 (Reference count crate_inherent_implss return value.)
miri: for uniformity, also move memory_deallocated to AllocationExtra #55888 (miri: for uniformity, also move memory_deallocated to AllocationExtra)
global allocators: add a few comments #55889 (global allocators: add a few comments)
Document optimizations enabled by FusedIterator #55896 (Document optimizations enabled by FusedIterator)
Change Lit::short_name to Lit::literal_name. #55905 (Change Lit::short_name to Lit::literal_name.)
Fix their/there grammar nit #55908 (Fix their/there grammar nit)

…rameters

…stdout/err

…ring

Follow-up to rust-lang@c2bb7ca.

The repeated cloning of the result in `inherent_impls` queries has quite an impact on crates with many inherent trait implementations.

This avoids a moderately hot allocation in `parse_lit_token`.

@Stebalien

When reading this I wondered what “some significant optimizations” referred to. As far as I can tell, the specialization of `.fuse()` is the only case where `FusedIterator` has any impact at all. Is this accurate @Stebalien?

This means it can be used by more crates.

And make it x86_64-only so it can use `==` instead of `<=`.

And make them x86_64-only so they can use `==` instead of `<=`.

kennytm · 2018-11-13T05:03:50Z

@bors r+ p=21

bors · 2018-11-13T11:48:23Z

⌛ Testing commit 7921572 with merge 92af91bb950f27ca841d7ec3bc67d3ca2fe6be68...

bors · 2018-11-13T12:22:23Z

💔 Test failed - status-travis

rust-highfive · 2018-11-13T12:22:25Z

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:00:07] Cloning into '/home/travis/build/rust-lang/rust/src/tools/rustfmt'...
[00:00:07] Cloning into '/home/travis/build/rust-lang/rust/src/tools/clippy'...
[00:00:07] Cloning into '/home/travis/build/rust-lang/rust/src/tools/cargo'...
[00:00:07] Cloning into '/home/travis/build/rust-lang/rust/src/tools/clang'...
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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)

kennytm · 2018-11-13T12:44:54Z

@bors retry

bors · 2018-11-13T15:12:29Z

⌛ Testing commit 7921572 with merge 3cb42d725d089ed1e4a53f75e25532ea7a9d38b5...

bors · 2018-11-13T19:12:31Z

💥 Test timed out

kennytm · 2018-11-13T19:19:31Z

@bors retry ಠ_ಠ

bors · 2018-11-13T22:17:52Z

⌛ Testing commit 7921572 with merge f1d6183...

Rollup of 20 pull requests Successful merges: - #55136 (Remove short doc where it starts with a codeblock) - #55711 (Format BtreeMap::range_mut example) - #55722 (impl_stable_hash_for: support enums and tuple structs with generic parameters) - #55754 (Avoid converting bytes to UTF-8 strings to print, just pass bytes to stdout/err) - #55804 (rustdoc: don't inline `pub use some_crate` unless directly asked to) - #55805 (Move `static_assert!` into librustc_data_structures) - #55837 (Make PhantomData #[structural_match]) - #55840 (Fix TLS errors when downloading stage0) - #55843 (add FromIterator<A> to Box<[A]>) - #55858 (Small fixes on code blocks in rustdoc) - #55863 (Fix a typo in std::panic) - #55870 (Fix typos.) - #55874 (string: Add documentation for `From` impls) - #55879 (save-analysis: Don't panic for macro-generated use globs) - #55882 (Reference count `crate_inherent_impls`s return value.) - #55888 (miri: for uniformity, also move memory_deallocated to AllocationExtra) - #55889 (global allocators: add a few comments) - #55896 (Document optimizations enabled by FusedIterator) - #55905 (Change `Lit::short_name` to `Lit::literal_name`.) - #55908 (Fix their/there grammar nit)

bors · 2018-11-14T01:18:32Z

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing f1d6183 to master...

rust-highfive · 2018-11-14T01:19:40Z

📣 Toolstate changed by #55912!

Tested on commit f1d6183.
Direct link to PR: #55912

💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

@nrc

Tested on commit rust-lang/rust@f1d6183. Direct link to PR: <rust-lang/rust#55912> 💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

nrc · 2018-11-14T02:43:16Z

I can't see an error in the logs :-s

kennytm · 2018-11-14T03:35:35Z

@nrc You've got a spurious error in the RLS test.

[02:11:56] ---- cmd_changing_workspace_lib_retains_bin_diagnostics stdout ----
[02:11:56] thread 'cmd_changing_workspace_lib_retains_bin_diagnostics' panicked at 'assertion failed: `(left == right)`
[02:11:56]   left: `String("E0425")`,
[02:11:56]  right: `"unused_variables"`', tools\rls\tests\tests.rs:408:5
[02:11:56] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[02:11:56] ---rls-stdout---
[02:11:56] Content-Length: 605
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","id":0,"result":{"capabilities":{"textDocumentSync":2,"hoverProvider":true,"completionProvider":{"resolveProvider":true,"triggerCharacters":[".",":"]},"definitionProvider":true,"implementationProvider":true,"referencesProvider":true,"documentHighlightProvider":true,"documentSymbolProvider":true,"workspaceSymbolProvider":true,"codeActionProvider":true,"codeLensProvider":{"resolveProvider":false},"documentFormattingProvider":true,"documentRangeFormattingProvider":false,"renameProvider":true,"executeCommandProvider":{"commands":["rls.applySuggestion-2560","rls.deglobImports-2560"]}}}}Content-Length: 92
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_1","title":"Building"}}Content-Length: 112
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_1","message":"library","title":"Building"}}Content-Length: 122
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_1","message":"library cfg(test)","title":"Building"}}Content-Length: 111
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_1","message":"binary","title":"Building"}}Content-Length: 121
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_1","message":"binary cfg(test)","title":"Building"}}Content-Length: 104
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_1","title":"Building"}}Content-Length: 92
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_0","title":"Indexing"}}Content-Length: 733
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"unused_variables","message":"unused variable: `unused`\n\nnote: #[warn(unused_variables)] on by default\nhelp: consider using `_unused` instead: `_unused`","range":{"end":{"character":30,"line":2},"start":{"character":24,"line":2}},"severity":2,"source":"rustc"},{"code":"unused_variables","message":"unused variable: `test_val`\n\nhelp: consider using `_test_val` instead: `_test_val`","range":{"end":{"character":36,"line":9},"start":{"character":28,"line":9}},"severity":2,"source":"rustc"}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t0/simple_workspace/library/src/lib.rs"}}Content-Length: 493
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"unused_variables","message":"unused variable: `val`\n\nnote: #[warn(unused_variables)] on by default\nhelp: consider using `_val` instead: `_val`","range":{"end":{"character":27,"line":4},"start":{"character":24,"line":4}},"severity":2,"source":"rustc"}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t0/simple_workspace/binary/src/main.rs"}}Content-Length: 104
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_0","title":"Indexing"}}Content-Length: 92
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_3","title":"Building"}}Content-Length: 112
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_3","message":"library","title":"Building"}}Content-Length: 121
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_3","message":"binary cfg(test)","title":"Building"}}Content-Length: 111
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_3","message":"binary","title":"Building"}}Content-Length: 122
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_3","message":"library cfg(test)","title":"Building"}}Content-Length: 104
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_3","title":"Building"}}Content-Length: 92
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_2","title":"Indexing"}}Content-Length: 681
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"unused_variables","message":"unused variable: `unused`\n\nnote: #[warn(unused_variables)] on by default\nhelp: consider using `_unused` instead: `_unused`","range":{"end":{"character":30,"line":2},"start":{"character":24,"line":2}},"severity":2,"source":"rustc"},{"code":"E0308","message":"mismatched types\n\nexpected u32, found u64","range":{"end":{"character":62,"line":9},"start":{"character":44,"line":9}},"severity":1,"source":"rustc"}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t0/simple_workspace/library/src/lib.rs"}}Content-Length: 409
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"E0308","message":"mismatched types\n\nexpected u32, found u64","range":{"end":{"character":55,"line":4},"start":{"character":35,"line":4}},"severity":1,"source":"rustc"}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t0/simple_workspace/binary/src/main.rs"}}Content-Length: 104
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_2","title":"Indexing"}}Content-Length: 92
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_5","title":"Building"}}Content-Length: 122
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_5","message":"library cfg(test)","title":"Building"}}Content-Length: 112
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_5","message":"library","title":"Building"}}Content-Length: 121
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_5","message":"binary cfg(test)","title":"Building"}}Content-Length: 111
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_5","message":"binary","title":"Building"}}Content-Length: 104
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_5","title":"Building"}}Content-Length: 92
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_4","title":"Indexing"}}Content-Length: 733
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"unused_variables","message":"unused variable: `unused`\n\nnote: #[warn(unused_variables)] on by default\nhelp: consider using `_unused` instead: `_unused`","range":{"end":{"character":30,"line":2},"start":{"character":24,"line":2}},"severity":2,"source":"rustc"},{"code":"unused_variables","message":"unused variable: `test_val`\n\nhelp: consider using `_test_val` instead: `_test_val`","range":{"end":{"character":36,"line":9},"start":{"character":28,"line":9}},"severity":2,"source":"rustc"}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t0/simple_workspace/library/src/lib.rs"}}Content-Length: 444
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"E0425","message":"cannot find function `fetch_u32` in module `library`\n\nnot found in `library`","range":{"end":{"character":53,"line":4},"start":{"character":44,"line":4}},"severity":1,"source":"rustc"}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t0/simple_workspace/binary/src/main.rs"}}Content-Length: 104
[02:11:56] 
[02:11:56] {"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_4","title":"Indexing"}}
[02:11:56] ---------------
[02:11:56] 
[02:11:56] 
[02:11:56] failures:
[02:11:56]     cmd_changing_workspace_lib_retains_bin_diagnostics
[02:11:56] 
[02:11:56] test result: FAILED. 7 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

kngwyu and others added 29 commits November 6, 2018 16:28

Format BtreeMap::range_mut example

1224e01

impl_stable_hash_for: support enums and tuple structs with generic pa…

db3c69e

…rameters

don't inline pub use some_crate unless directly asked to

401cb6b

make PhantomData #[structural_match].

5e7b7f2

add FromIterator<A> to Box<[A]>

852ff1f

Avoid converting bytes to UTF-8 strings to print, just pass bytes to …

3b3b60c

…stdout/err

Remove short doc where it starts with a codeblock

3030cbe

Small fixes on code blocks in rustdoc

0edc9e8

Fix a typo in std::panic

20ef40a

Merge branch 'master' of https://github.com/rust-lang/rust

5030794

change attribute to stable

ab55d9b

Fix typos.

a62af85

Added comment for From trait implementation: boxed string slice to St…

93b5112

…ring

Added comments for trait implementations.

f0bfbd3

Whitespace cleanup according to Rust's style guidelines.

dc0fd65

Minor style guide corrections.

6f3add3

save-analysis: Don't panic for macro-generated use globs

04cc0d6

Follow-up to rust-lang@c2bb7ca.

Reference count crate_inherent_implss return value.

4fdae85

The repeated cloning of the result in `inherent_impls` queries has quite an impact on crates with many inherent trait implementations.

Fix TLS errors when downloading stage0

c211238

Change Lit::short_name to Lit::literal_name.

c686299

This avoids a moderately hot allocation in `parse_lit_token`.

for uniformity, also move memory_deallocated to AllocationExtra

ace20b9

global allocators: add a few comments

075983c

remove unused import

3c88cfe

Document optimizations enabled by FusedIterator

4da9f10

When reading this I wondered what “some significant optimizations” referred to. As far as I can tell, the specialization of `.fuse()` is the only case where `FusedIterator` has any impact at all. Is this accurate @Stebalien?

Move static_assert! into librustc_data_structures.

ab8a947

This means it can be used by more crates.

Move a static_assert! to a better spot.

49f482f

And make it x86_64-only so it can use `==` instead of `<=`.

Add a static assertion about the size of ast::Expr.

fb3dd9f

Move two static_assert!s to better spots.

2bd4d5b

And make them x86_64-only so they can use `==` instead of `<=`.

Fix their/there grammar nit

533d26f

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 13, 2018

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 Nov 13, 2018

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 Nov 13, 2018

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 Nov 13, 2018

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 Nov 13, 2018

bors mentioned this pull request Nov 13, 2018

std: Synchronize access to global env during exec #55939

Merged

bors merged commit 7921572 into rust-lang:master Nov 14, 2018

bors mentioned this pull request Nov 14, 2018

Allow calling const unsafe fn in const fn behind a feature gate #55635

Merged

kennytm mentioned this pull request Nov 20, 2018

Spurious 30 minutes timeout on Travis CI #56112

Closed

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 20 pull requests #55912

Rollup of 20 pull requests #55912

kennytm commented Nov 13, 2018 •

edited

Loading

kennytm commented Nov 13, 2018

bors commented Nov 13, 2018

bors commented Nov 13, 2018

rust-highfive commented Nov 13, 2018

kennytm commented Nov 13, 2018

bors commented Nov 13, 2018

bors commented Nov 13, 2018

kennytm commented Nov 13, 2018

bors commented Nov 13, 2018

bors commented Nov 14, 2018

rust-highfive commented Nov 14, 2018

nrc commented Nov 14, 2018

kennytm commented Nov 14, 2018

Rollup of 20 pull requests #55912

Rollup of 20 pull requests #55912

Conversation

kennytm commented Nov 13, 2018 • edited Loading

kennytm commented Nov 13, 2018

bors commented Nov 13, 2018

bors commented Nov 13, 2018

rust-highfive commented Nov 13, 2018

kennytm commented Nov 13, 2018

bors commented Nov 13, 2018

bors commented Nov 13, 2018

kennytm commented Nov 13, 2018

bors commented Nov 13, 2018

bors commented Nov 14, 2018

rust-highfive commented Nov 14, 2018

nrc commented Nov 14, 2018

kennytm commented Nov 14, 2018

kennytm commented Nov 13, 2018 •

edited

Loading