Rollup of 15 pull requests by Manishearth · Pull Request #74330 · rust-lang/rust

Manishearth · 2020-07-14T14:39:21Z

Successful merges:

Add Ayu theme to rustdoc #71237 (Add Ayu theme to rustdoc)
Clean up E0704 error explanation #73720 (Clean up E0704 error explanation)
Obviate #[allow(improper_ctypes_definitions)] #73866 (Obviate #[allow(improper_ctypes_definitions)])
typeck: check for infer before type impls trait #73965 (typeck: check for infer before type impls trait)
add (unchecked) indexing methods to raw (and NonNull) slices #73986 (add (unchecked) indexing methods to raw (and NonNull) slices)
Detect tuple struct incorrectly used as struct pat #74173 (Detect tuple struct incorrectly used as struct pat)
Refactor Windows parse_prefix #74220 (Refactor Windows parse_prefix)
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 )
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)
Clarify the description for rfind #74296 (Clarify the description for rfind)
Use ArrayVec in SparseBitSet. #74310 (Use ArrayVec in SparseBitSet.)
Remove unnecessary type hints from Wake internals #74316 (Remove unnecessary type hints from Wake internals)
Update Clippy #74324 (Update Clippy)

Failed merges:

rust-lang#5626: lint iterator.map(|x| x) changelog: adds a new lint for iterator.map(|x| x) (see rust-lang/rust-clippy#5626) The code also lints for result.map(|x| x) and option.map(|x| x). Also, I'm not sure if I'm checking for type adjustments correctly and I can't think of an example where .map(|x| x) would apply type adjustments.

Context: this is needed to fix rust-lang/rustfmt#4263, which currently records the span of a const generic param incorrectly because the location of the `const` kw is not known. I am not sure how to add tests for this; any guidance in how to do so would be appreciated 🙂

clone_on_copy - add machine applicability Fix rust-lang#4826. Change the applicability of the lint clone_on_copy. Split a test file and run rustfix on the clone_on_copy part. changelog: clone_on_copy - add machine applicability

cmp_owned: handle when PartialEq is not implemented symmetrically changelog: Handle asymmetrical implementations of PartialEq in [`cmp_owned`]. Fixes rust-lang#4874

Change a noun to a verb to make the sentence complete changelog: Fixed some grammar in the documentation for `await_holding_lock`. Just a tiny little thing I found while using clippy <3

…morse Record span of `const` kw in GenericParamKind Context: this is needed for a fix of rust-lang/rustfmt#4263, which currently records the span of a const generic param incorrectly because the location of the `const` kw is not known. I am not sure how to add tests for this; any guidance in how to do so would be appreciated 🙂

@ghost

…arth Rollup of 13 pull requests Successful merges: - rust-lang#72620 (Omit DW_AT_linkage_name when it is the same as DW_AT_name) - rust-lang#72967 (Don't move cursor in search box when using arrows to navigate results) - rust-lang#73102 (proc_macro: Stop flattening groups with dummy spans) - rust-lang#73297 (Support configurable deny-warnings for all in-tree crates.) - rust-lang#73507 (Cleanup MinGW LLVM linkage workaround) - rust-lang#73588 (Fix handling of reserved registers for ARM inline asm) - rust-lang#73597 (Record span of `const` kw in GenericParamKind) - rust-lang#73629 (Make AssocOp Copy) - rust-lang#73681 (Update Chalk to 0.14) - rust-lang#73707 (Fix links in `SliceIndex` documentation) - rust-lang#73719 (emitter: column width defaults to 140) - rust-lang#73729 (disable collectionbenches for android) - rust-lang#73748 (Add code block to code in documentation of `List::rebase_onto`) Failed merges: r? @ghost

Modifies the return type for `fn entry` so that allowing improper_ctypes_definitions is no longer necessary. This change is derived from a similar pattern in `libstd/sys/sgx/abi/usercalls/raw.rs` with `UsercallReturn`.

This commit modifies the Place as follow: * remove 'ty' from ProjectionKind * add type information into to Projection * replace 'ty' in Place with 'base_ty' * introduce 'ty()' in `Place` to return the final type of the `Place` * introduce `ty_before_projection()` in `Place` to return the type of a `Place` before i'th projection is applied Closes rust-lang/project-rfc-2229#5

@Manishearth

Rustup cc rust-lang#73743 r? @Manishearth changelog: none

…s, r=Manishearth,flip1995,phansch,oli-obk Lint enabling the whole restriction group I've added it to the `correctness` category, but I may be missing some valid use cases. In that case it could be changed to `pedantic`. changelog: Add [`blanket_clippy_restriction_lints`] to check against enabling the whole restriction group.

Require `or_patterns` to suggest nesting them changelog: Require `#![feature(or_patterns)]` to trigger [`unnested_or_patterns`] Fixes rust-lang#5704

Fix the versions of packages in the multiple_crate_versions ui test by checking in the Cargo.lock for the test package. `ansi_term 0.11` depends on `winapi ^0.3.4`. This means means that the expected stderr for this test would have to be updated whenever `winapi 0.3` is updated otherwise.

…701, r=matthiaskrgr Fix multiple_crate_versions error Fix the versions of packages in the multiple_crate_versions ui test by checking in the Cargo.lock for the test package. `ansi_term 0.11` depends on `winapi ^0.3.4`. This means means that the expected stderr for this test would have to be updated whenever `winapi 0.3` is updated otherwise. changelog: none

bors · 2020-07-14T14:39:52Z

📌 Commit 5414eae has been approved by Manishearth

bors · 2020-07-14T14:39:53Z

🌲 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-14T14:40:05Z

⌛ Testing commit 5414eae with merge 7fe2b23bd5869bb62c8107d59d9ca145a3ac8e48...

bors · 2020-07-14T16:56:44Z

💔 Test failed - checks-azure

Manishearth · 2020-07-14T17:10:58Z

@bors retry

bors · 2020-07-14T17:11:14Z

⌛ Testing commit 5414eae with merge 2002eba...

Manishearth · 2020-07-14T17:16:10Z

[RUSTC-TIMING] build_script_main test:false 5.100
The following warnings were emitted during compilation:

warning: error: Connection to server timed out

error: failed to run custom build command for `libnghttp2-sys v0.1.2`

Caused by:
  process didn't exit successfully: `/Users/runner/work/1/s/build/x86_64-apple-darwin/stage1-tools/release/build/libnghttp2-sys-4027708d4b09760f/build-script-build` (exit code: 1)
--- stdout
TARGET = Some("x86_64-apple-darwin")
OPT_LEVEL = Some("3")
HOST = Some("x86_64-apple-darwin")
CC_x86_64-apple-darwin = Some("sccache /Users/runner/work/1/s/clang+llvm-9.0.0-x86_64-darwin-apple/bin/clang")
CFLAGS_x86_64-apple-darwin = Some("-ffunction-sections -fdata-sections -fPIC --target=x86_64-apple-darwin -stdlib=libc++ -fdebug-prefix-map=/Users/runner/work/1/s=/rustc/7fe2b23bd5869bb62c8107d59d9ca145a3ac8e48")
CRATE_CC_NO_DEFAULTS = None
DEBUG = Some("false")
running: "sccache" "/Users/runner/work/1/s/clang+llvm-9.0.0-x86_64-darwin-apple/bin/clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-stdlib=libc++" "-fdebug-prefix-map=/Users/runner/work/1/s=/rustc/7fe2b23bd5869bb62c8107d59d9ca145a3ac8e48" "-I" "nghttp2/lib/includes" "-I" "/Users/runner/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-3462f163910044cd/out/i/include" "-DNGHTTP2_STATICLIB" "-DHAVE_NETINET_IN" "-DHAVE_ARPA_INET_H" "-o" "/Users/runner/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-3462f163910044cd/out/i/lib/nghttp2/lib/nghttp2_buf.o" "-c" "nghttp2/lib/nghttp2_buf.c"
cargo:warning=error: Connection to server timed out
exit code: 2
running: "sccache" "/Users/runner/work/1/s/clang+llvm-9.0.0-x86_64-darwin-apple/bin/clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-stdlib=libc++" "-fdebug-prefix-map=/Users/runner/work/1/s=/rustc/7fe2b23bd5869bb62c8107d59d9ca145a3ac8e48" "-I" "nghttp2/lib/includes" "-I" "/Users/runner/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-3462f163910044cd/out/i/include" "-DNGHTTP2_STATICLIB" "-DHAVE_NETINET_IN" "-DHAVE_ARPA_INET_H" "-o" "/Users/runner/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-3462f163910044cd/out/i/lib/nghttp2/lib/nghttp2_callbacks.o" "-c" "nghttp2/lib/nghttp2_callbacks.c"
exit code: 0

--- stderr


error occurred: Command "sccache" "/Users/runner/work/1/s/clang+llvm-9.0.0-x86_64-darwin-apple/bin/clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-stdlib=libc++" "-fdebug-prefix-map=/Users/runner/work/1/s=/rustc/7fe2b23bd5869bb62c8107d59d9ca145a3ac8e48" "-I" "nghttp2/lib/includes" "-I" "/Users/runner/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-3462f163910044cd/out/i/include" "-DNGHTTP2_STATICLIB" "-DHAVE_NETINET_IN" "-DHAVE_ARPA_INET_H" "-o" "/Users/runner/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/build/libnghttp2-sys-3462f163910044cd/out/i/lib/nghttp2/lib/nghttp2_buf.o" "-c" "nghttp2/lib/nghttp2_buf.c" with args "clang" did not execute successfully (status code exit code: 2).

network stuff

bors · 2020-07-14T20:16:25Z

☀️ Test successful - checks-actions, checks-azure
Approved by: Manishearth
Pushing 2002eba to master...

Manishearth · 2020-07-14T20:20:40Z

Ooh, CI time is down to three hours from four hours and fifteen minutes! I assume it's the caching thing

theo-lw and others added 30 commits June 13, 2020 10:08

Added a lint for .map(|x| x)

40ee620

Merge commit 'c2c07fa9d095931eb5684a42942a7b573a0c5238' into clippyup

80bcbf5

Fix pattern match of ExprKind::MethodCall

fb4f9a0

cmp_owned: avoid FP when PartialEq is not implemented symmetrically

5987c7d

cmp_owned: reverse operands if necessary

b498e1d

copy_on_clone - add machine applicability

6bf5434

Auto merge of rust-lang#5701 - ebroto:4874_cmp_owned_fp, r=flip1995

46d3304

cmp_owned: handle when PartialEq is not implemented symmetrically changelog: Handle asymmetrical implementations of PartialEq in [`cmp_owned`]. Fixes rust-lang#4874

Clean up E0704 error explanation

3e48aae

Change a noun to a verb to make the sentence complete

fa0f1d3

Auto merge of rust-lang#5748 - carols10cents:tiny-docs-fix, r=flip1995

88fec89

Change a noun to a verb to make the sentence complete changelog: Fixed some grammar in the documentation for `await_holding_lock`. Just a tiny little thing I found while using clippy <3

rustc_lint: only query typeck_tables_of when a lint needs it.

f5ce0e5

Update tests

3c5ee33

Obviate #[allow(improper_ctypes_definitions)]

9448ed4

Modifies the return type for `fn entry` so that allowing improper_ctypes_definitions is no longer necessary. This change is derived from a similar pattern in `libstd/sys/sgx/abi/usercalls/raw.rs` with `UsercallReturn`.

Merge remote-tracking branch 'upstream/master' into rustup2

1e861a2

Disable chrono integration test

ab649c9

Auto merge of rust-lang#5751 - flip1995:rustup, r=Manishearth,flip1995

ccf7cb3

Rustup cc rust-lang#73743 r? @Manishearth changelog: none

Lint enabling the whole restriction group

814349f

Move blanket_clippy_restriction_lints to "style"

c5d8f53

Require or_patterns to suggest nesting them

bff6c43

Auto merge of rust-lang#5758 - ebroto:5704_unnested_or_pats, r=flip1995

36b7983

Require `or_patterns` to suggest nesting them changelog: Require `#![feature(or_patterns)]` to trigger [`unnested_or_patterns`] Fixes rust-lang#5704

Deprecate regex_macro lint

d347d0c

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 14, 2020

bors merged commit 2002eba into rust-lang:master Jul 14, 2020

bors mentioned this pull request Jul 14, 2020

Refactor Windows parse_prefix #74220

Merged

Manishearth deleted the rollup-mrc09pb branch July 14, 2020 20:17

This was referenced Jul 14, 2020

More static symbols #74175

Merged

forbid generic params in the type of const params #74159

Merged

cuviper added this to the 1.47.0 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 15 pull requests#74330

Rollup of 15 pull requests#74330
bors merged 149 commits intorust-lang:masterfrom
Manishearth:rollup-mrc09pb

Manishearth commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

Manishearth commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

Manishearth commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

Manishearth commented Jul 14, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Conversation

Manishearth commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

Manishearth commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

Manishearth commented Jul 14, 2020

Uh oh!

bors commented Jul 14, 2020

Uh oh!

Manishearth commented Jul 14, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants