Rollup of 7 pull requests #60472

kennytm · 2019-05-02T15:23:55Z

Successful merges:

Make deprecation lint ambiguous_associated_items deny-by-default #59928 (Make deprecation lint ambiguous_associated_items deny-by-default)
Added arm-none-eabi target #60135 (Added arm-none-eabi target)
update miri #60173 (update miri)
report fatal errors during doctest parsing #60220 (report fatal errors during doctest parsing)
Tidy: ensure lang features are sorted by since #60373 (Tidy: ensure lang features are sorted by since)
libprofiler_builtins: Set compilation flags more correctly for C code. #60402 (libprofiler_builtins: Set compilation flags more correctly for C code.)
Update RLS and Cargo #60436 (Update RLS and Cargo)

Failed merges:

In particular, set COMPILER_RT_HAS_FCNTL_LCK and COMPILER_RT_HAS_ATOMICS as appropriate.

Align with the version bump in rust-lang/rls#1448

`find_attr_val(&line, "since")` returns `Some(", issue = ")` when `line` is set to the following line: ``` [unstable(feature = "checked_duration_since", issue = "58402")] ``` Make `find_attr_val` use regex that is a little bit more precise (requires `=` after key name). It still does not handle all cases (e.g., extra leading chars in key name, or escaped quotes in value), but is good enough for now.

@Centril

Make deprecation lint `ambiguous_associated_items` deny-by-default As requested by r? @Centril cc rust-lang#57644

Added arm-none-eabi target Hello, This PR adds a new target for compiling bare-metal ARM Cortex-A programs. I've managed to build and use this new target, but I am unclear with regards to a few details: - I'm not sure what are the criteria for choosing between lld and gnu-ld - When trying to build with `./x.py build --target arm-none-eabi`, the script tries to compile with `cc`, instead of `arm-none-eabi-gcc`. It could find different cross-compilers just fine, but I didn't understand where I had to specify it. (I ended up specifying `CC_arm_none_eabi=arm-none-eabi-gcc` in the environment). - I couldn't find where I can exclude std from compiling for this target (as I guess occurs with other bare-metal targets). - Should I add a separate target for `eabihf`?

@oli-obk

update miri r? @oli-obk

…rrors, r=QuietMisdreavus report fatal errors during doctest parsing Fixes rust-lang#59557.

@Centril

… r=Centril Tidy: ensure lang features are sorted by since This is the tidy side of rust-lang#60361. What is left is actually splitting features into groups and sorting by since. This PR also likely to produce a small (a couple of lines) merge conflict with rust-lang#60362. r? @Centril

@alexcrichton

…-build, r=alexcrichton libprofiler_builtins: Set compilation flags more correctly for C code. In particular, set `COMPILER_RT_HAS_FCNTL_LCK` and `COMPILER_RT_HAS_ATOMICS` as appropriate. This should get rid of the various runtime warnings when executing instrumented binaries. The build script is using a heuristic here that hopefully is sufficient for the time being. r? @alexcrichton Fixes rust-lang#59531.

@Centril

Update RLS and Cargo Fixes the `test-fail` RLS toolstate caused by rust-lang#59114. r? @Centril @Manishearth

kennytm · 2019-05-02T15:24:38Z

@bors r+ p=7

bors · 2019-05-02T15:24:41Z

📌 Commit acb25d7 has been approved by kennytm

bors · 2019-05-02T16:23:05Z

⌛ Testing commit acb25d7 with merge f4e7871cbb2306447e01b16bafaf42023dab5ac2...

rust-highfive · 2019-05-02T17:23:36Z

The job x86_64-gnu-tools of 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.

travis_time:end:13d49f6b:start=1556810728806618253,finish=1556810804737333520,duration=75930715267
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_1"), "message": String("binary cfg(test)"), "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_1"), "message": String("binary"), "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Bool(true), "id": String("progress_1"), "message": Null, "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_0"), "message": Null, "percentage": Null, "title": String("Indexing")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("textDocument/publishDiagnostics"), "params": Object({"diagnostics": Array([Object({"code": String("unused_variables"), "message": String("unused variable: `val`\n\nnote: #[warn(unused_variables)] on by default\nhelp: consider prefixing with an underscore: `_val`"), "range": Object({"end": Object({"character": Number(27), "line": Number(4)}), "start": Object({"character": Number(24), "line": Number(4)})}), "severity": Number(2), "source": String("rustc")})]), "uri": String("file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/rlsit/t4/simple_workspace/binary/src/main.rs")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("textDocument/publishDiagnostics"), "params": Object({"diagnostics": Array([Object({"code": String("unused_variables"), "message": String("unused variable: `unused`\n\nnote: #[warn(unused_variables)] on by default\nhelp: consider prefixing with an underscore: `_unused`"), "range": Object({"end": Object({"character": Number(30), "line": Number(2)}), "start": Object({"character": Number(24), "line": Number(2)})}), "severity": Number(2), "source": String("rustc")}), Object({"code": String("unused_variables"), "message": String("unused variable: `test_val`\n\nhelp: consider prefixing with an underscore: `_test_val`"), "range": Object({"end": Object({"character": Number(36), "line": Number(9)}), "start": Object({"character": Number(28), "line": Number(9)})}), "severity": Number(2), "source": String("rustc")})]), "uri": String("file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/rlsit/t4/simple_workspace/library/src/lib.rs")})})
[01:49:38] Sending: Object({"jsonrpc": String("2.0"), "method": String("textDocument/didChange"), "params": Object({"contentChanges": Array([Object({"range": Object({"end": Object({"character": Number(41), "line": Number(1)}), "start": Object({"character": Number(38), "line": Number(1)})}), "rangeLength": Number(3), "text": String("u64")})]), "textDocument": Object({"uri": String("file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/rlsit/t4/simple_workspace/library/src/lib.rs"), "version": Number(0)})})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_3"), "message": Null, "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_3"), "message": String("library"), "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_3"), "message": String("binary"), "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_3"), "message": String("binary cfg(test)"), "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_3"), "message": String("binary cfg(test)"), "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_3"), "message": String("library cfg(test)"), "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Bool(true), "id": String("progress_3"), "message": Null, "percentage": Null, "title": String("Building")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Null, "id": String("progress_2"), "message": Null, "percentage": Null, "title": String("Indexing")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("textDocument/publishDiagnostics"), "params": Object({"diagnostics": Array([Object({"code": String("E0425"), "message": String("cannot find function `fetch_u32` in module `library`\n\nnot found in `library`"), "range": Object({"end": Object({"character": Number(53), "line": Number(4)}), "start": Object({"character": Number(44), "line": Number(4)})}), "severity": Number(1), "source": String("rustc")})]), "uri": String("file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/rlsit/t4/simple_workspace/binary/src/main.rs")})})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("textDocument/publishDiagnostics"), "params": Object({"diagnostics": Array([Object({"code": String("unused_variables"), "message": String("unused variable: `unused`\n\nnote: #[warn(unused_variables)] on by default\nhelp: consider prefixing with an underscore: `_unused`"), "range": Object({"end": Object({"character": Number(30), "line": Number(2)}), "start": Object({"character": Number(24), "line": Number(2)})}), "severity": Number(2), "source": String("rustc")}), Object({"code": String("E0308"), "message": String("mismatched types\n\nexpected u32, found u64\n\nhelp: you can convert an `u64` to `u32` or panic if it the converted value wouldn\'t fit: `super::fetch_u32().try_into().unwrap()`"), "range": Object({"end": Object({"character": Number(62), "line": Number(9)}), "start": Object({"character": Number(44), "line": Number(9)})}), "severity": Number(1), "source": String("rustc")})]), "uri": String("file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/rlsit/t4/simple_workspace/library/src/lib.rs")})})
[01:49:38] thread 'client_changing_workspace_lib_retains_diagnostics' panicked at 'assertion failed: bin.diagnostics[0].message.contains("mismatched types\n\nexpected u32, found u64")', src/tools/rls/tests/client.rs:276:5
[01:49:38] Sending: Object({"id": Number(99999), "jsonrpc": String("2.0"), "method": String("shutdown"), "params": Null})
[01:49:38] Processing message: Object({"jsonrpc": String("2.0"), "method": String("window/progress"), "params": Object({"done": Bool(true), "id": String("progress_2"), "message": Null, "percentage": Null, "title": String("Indexing")})})
[01:49:38] Processing message: Object({"id": Number(99999), "jsonrpc": String("2.0"), "result": Null})
[01:49:38] Sending: Object({"jsonrpc": String("2.0"), "method": String("exit"), "params": Null})
---
[01:56:36] Verifying status of edition-guide...
[01:56:36] Verifying status of rls...
[01:56:36] This PR updated 'src/tools/rls', verifying if status is 'test-pass'...
[01:56:36] 
[01:56:36] ⚠️ We detected that this PR updated 'rls', but its tests failed.
[01:56:36] 
[01:56:36] If you do intend to update 'rls', please check the error messages above and
[01:56:36] commit another update.
[01:56:36] 
[01:56:36] If you do NOT intend to update 'rls', please ensure you did not accidentally
[01:56:36] change the submodule at 'src/tools/rls'. You may ask your reviewer for the
[01:56:36] proper steps.

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 · 2019-05-02T17:43:42Z

💔 Test failed - status-appveyor

petrochenkov and others added 26 commits April 12, 2019 22:32

Make deprecation lint ambiguous_associated_items deny-by-default

bee92b5

Added arm-none-eabi target

be33738

Added armv7-none target instead of arm-none

d8cc8dc

Set armv7-none to use strict alignment

bd42e12

report fatal errors during doctest parsing

a912664

Added non hf armv7a target

c8baec9

Update RLS

3b24cf8

update miri

71338fc

libprofiler_builtins: Set compilation flags more correctly for C code.

d4dfbeb

In particular, set COMPILER_RT_HAS_FCNTL_LCK and COMPILER_RT_HAS_ATOMICS as appropriate.

Update Cargo

31407e8

Align with the version bump in rust-lang/rls#1448

Assign group and parse since for Feature

b7f55ca

Ensure language features in group are sorted by since

d5ba6d4

Address review comments

d54477e

Make tidy::version::Version a [u32; 3]

90d3fa2

Group and sort feature_gate.rs

3b4fe7e

Rework Version::parse to avoid extra allocations

c120fd8

Make in_feature_group a simple bool flag

4bcc828

Make tidy::version::Version copy

201f14b

Rollup merge of rust-lang#59928 - petrochenkov:denyambass, r=varkor

50be6df

Make deprecation lint `ambiguous_associated_items` deny-by-default As requested by r? @Centril cc rust-lang#57644

Rollup merge of rust-lang#60173 - RalfJung:miri, r=oli-obk

e3f94c8

update miri r? @oli-obk

Rollup merge of rust-lang#60220 - euclio:rustdoc-test-fatal-parsing-e…

77ecb41

…rrors, r=QuietMisdreavus report fatal errors during doctest parsing Fixes rust-lang#59557.

Rollup merge of rust-lang#60436 - Xanewok:update-rls, r=Manishearth

acb25d7

Update RLS and Cargo Fixes the `test-fail` RLS toolstate caused by rust-lang#59114. r? @Centril @Manishearth

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 2, 2019

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 May 2, 2019

kennytm closed this May 2, 2019

kennytm deleted the rollup-0wdm7t4 branch May 2, 2019 19:55

ehuss mentioned this pull request May 29, 2019

client_changing_workspace_lib_retains_diagnostics fails frequently on slow drives rust-lang/rls#1466

Closed

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #60472

Rollup of 7 pull requests #60472

kennytm commented May 2, 2019

kennytm commented May 2, 2019

bors commented May 2, 2019

bors commented May 2, 2019

rust-highfive commented May 2, 2019

bors commented May 2, 2019

Rollup of 7 pull requests #60472

Rollup of 7 pull requests #60472

Conversation

kennytm commented May 2, 2019

kennytm commented May 2, 2019

bors commented May 2, 2019

bors commented May 2, 2019

rust-highfive commented May 2, 2019

bors commented May 2, 2019