Rollup of 10 pull requests #68011

JohnTitor · 2020-01-08T15:29:24Z

Successful merges:

Try statx for all linux-gnu target. #67774 (Try statx for all linux-gnu target.)
Move is_min_const_fn query to librustc_mir. #67781 (Move is_min_const_fn query to librustc_mir.)
Remove wrong advice about spin locks from spin_loop_hint docs #67798 (Remove wrong advice about spin locks from spin_loop_hint docs)
Add a check for swapped words when we can't find an identifier #67849 (Add a check for swapped words when we can't find an identifier)
Distinguish between private items and hidden items in rustdoc #67875 (Distinguish between private items and hidden items in rustdoc)
Option::{expect,unwrap} and Result::{expect, expect_err, unwrap, unwrap_err} have #[track_caller] #67887 (Option::{expect,unwrap} and Result::{expect, expect_err, unwrap, unwrap_err} have #[track_caller])
rustdoc: Remove more #[doc(cfg(..))] duplicates #67955 (rustdoc: Remove more #[doc(cfg(..))] duplicates)
Updates for VxWorks #67977 (Updates for VxWorks)
Remove insignificant notes from CStr documentation #67985 (Remove insignificant notes from CStr documentation)
ci: fix wrong shared.sh import for publish_toolstate #68003 (ci: fix wrong shared.sh import for publish_toolstate)

Failed merges:

Parse the syntax described in RFC 2632 #67820 (Parse the syntax described in RFC 2632)
Move intravisit => rustc_hir + misc cleanup #67979 (Move intravisit => rustc_hir + misc cleanup)

Using a pure spin lock for a critical section in a preemptable thread is always wrong, however short the critical section may be. The thread might be preempted, which will cause all other threads to hammer busily at the core for the whole quant. Moreover, if threads have different priorities, this might lead to a priority inversion problem and a deadlock. More generally, a spinlock is not more efficient than a well-written mutex, which typically does several spin iterations at the start anyway. The advise about UP vs SMP is also irrelevant in the context of preemptive threads.

I believe rustdoc should not be conflating private items (visibility lower than `pub`) and hidden items (attribute `doc(hidden)`). This matters now that Cargo is passing --document-private-items by default for bin crates. In bin crates that rely on macros, intentionally hidden implementation details of the macros can overwhelm the actual useful internal API that one would want to document. This PR restores the strip-hidden pass when documenting private items, and introduces a separate unstable --document-hidden-items option to skip the strip-hidden pass. The two options are orthogonal to one another.

Also includes a simple test with a custom panic hook to ensure we don't regress.

Co-Authored-By: lzutao <taolzu@gmail.com>

These notes are about a distinction that is not going to be observable in the API. Whether or not the UTF-8 check knows the string length ahead of time, these methods require linear time.

The only two uses of the associated methods are in librustc_mir and librustdoc. Please tell me if there is a better choice.

@alexcrichton

Try statx for all linux-gnu target. After rust-lang/libc#1577, which is contained in `libc` 0.2.66, provides `SYS_statx` for all Linux platform, so we can try to use `statx` for ~all Linux target~ all linux-gnu targets. Unfortunately, `struct statx` and `fn statx` is not a part of public interface of musl (currently), ~we still need to invoke it through `syscall`~ we does **not** support statx for musl or other libc impls currently. Previous PR: rust-lang#65094 cc @alexcrichton

Move `is_min_const_fn` query to librustc_mir. The only two uses of the associated methods are in `librustc_mir` and `librustdoc`. Please tell me if there is a better choice. cc rust-lang#65031

Remove wrong advice about spin locks from `spin_loop_hint` docs Using a pure spin lock for a critical section in a preemptable thread is always wrong, however short the critical section may be. The thread might be preempted, which will cause all other threads to hammer busily at the core for the whole quant. Moreover, if threads have different priorities, this might lead to a priority inversion problem and a deadlock. More generally, a spinlock is not more efficient than a well-written mutex, which typically does several spin iterations at the start anyway. The advise about UP vs SMP is also irrelevant in the context of preemptive threads. See also accompanying piece: https://matklad.github.io/2020/01/02/spinlocs-considered-harmful.html And another, independent piece: https://probablydance.com/2019/12/30/measuring-mutexes-spinlocks-and-how-bad-the-linux-scheduler-really-is EDIT: obligatory disclosure that I am not an expert in these things, and might be terribly wrong :)

@estebank

Add a check for swapped words when we can't find an identifier Fixes rust-lang#66968 Couple things here: 1. The matches take the precedence of case insensitive match, then levenshtein match, then swapped words match. Doing this allows us to not even check for swapped words unless the other checks return `None`. 2. I've assumed that the swapped words check is not held to the limits of the max levenshtein distance threshold (ie. we want to try and find a match even if the levenshtein distance is very high). This means that we cannot perform this check in the `fold` that occurs after the `filter_map` call, because the candidate will be filtered out. So, I've split this into two separate `fold` calls, and had to collect the original iterator into a vec so it can be copied (I don't think we want to change the function signature to take a vec or require the `Copy` trait). An alternative implemenation may be to remove the `filter_map`, `fold` over the entire iterator, and do a check against `max_dist` inside the relevant cases there. r? @estebank

Distinguish between private items and hidden items in rustdoc I believe rustdoc should not be conflating private items (visibility lower than `pub`) and hidden items (attribute `doc(hidden)`). This matters now that Cargo is passing --document-private-items by default for bin crates. In bin crates that rely on macros, intentionally hidden implementation details of the macros can overwhelm the actual useful internal API that one would want to document. This PR restores the strip-hidden pass when documenting private items, and introduces a separate unstable --document-hidden-items option to skip the strip-hidden pass. The two options are orthogonal to one another. Fixes rust-lang#67851. Closes rust-lang#60884.

`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` have `#[track_caller]` The annotated functions now produce panic messages pointing to the location where they were called, rather than `core`'s internals.

@GuillaumeGomez

…umeGomez rustdoc: Remove more `#[doc(cfg(..))]` duplicates This is a follow up to rust-lang#66959. r? @GuillaumeGomez

@alexcrichton

Updates for VxWorks r? @alexcrichton

Remove insignificant notes from CStr documentation The to_str and to_string_lossy methods contain a note about the behavior possibly changing in the future. But those notes are referring to a distinction that is not observable in the API. Whether or not the UTF-8 check knows the string length ahead of time, these methods require linear time.

@Mark-Simulacrum

…fix, r=Mark-Simulacrum ci: fix wrong shared.sh import for publish_toolstate r? @Mark-Simulacrum

JohnTitor · 2020-01-08T15:30:04Z

@bors r+ p=10 rollup=never

bors · 2020-01-08T15:30:06Z

📌 Commit 844530e has been approved by JohnTitor

JohnTitor · 2020-01-08T15:31:04Z

@bors p=101
Yield prio over ci fix

bors · 2020-01-08T15:31:31Z

⌛ Testing commit 844530e with merge 254db01...

@ghost

Rollup of 10 pull requests Successful merges: - #67774 (Try statx for all linux-gnu target.) - #67781 (Move `is_min_const_fn` query to librustc_mir.) - #67798 (Remove wrong advice about spin locks from `spin_loop_hint` docs) - #67849 (Add a check for swapped words when we can't find an identifier) - #67875 (Distinguish between private items and hidden items in rustdoc) - #67887 (`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` have `#[track_caller]`) - #67955 (rustdoc: Remove more `#[doc(cfg(..))]` duplicates) - #67977 (Updates for VxWorks) - #67985 (Remove insignificant notes from CStr documentation) - #68003 (ci: fix wrong shared.sh import for publish_toolstate) Failed merges: - #67820 (Parse the syntax described in RFC 2632) - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup) r? @ghost

rust-highfive · 2020-01-08T15:35:30Z

The job mingw-check of your PR failed (pretty log, 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.

2020-01-08T15:30:01.8901442Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-08T15:30:01.8912237Z ##[command]git config gc.auto 0
2020-01-08T15:30:01.8915732Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-08T15:30:01.8917650Z ##[command]git config --get-all http.proxy
2020-01-08T15:30:01.8920212Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/68011/merge:refs/remotes/pull/68011/merge

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)

JohnTitor · 2020-01-08T15:38:29Z

The failures for PR are spurious, let's check auto builders.

bors · 2020-01-08T19:46:31Z

💥 Test timed out

JohnTitor · 2020-01-08T19:46:54Z

@bors retry

bors · 2020-01-08T19:47:04Z

⌛ Testing commit 844530e with merge caa231d...

@ghost

Rollup of 10 pull requests Successful merges: - #67774 (Try statx for all linux-gnu target.) - #67781 (Move `is_min_const_fn` query to librustc_mir.) - #67798 (Remove wrong advice about spin locks from `spin_loop_hint` docs) - #67849 (Add a check for swapped words when we can't find an identifier) - #67875 (Distinguish between private items and hidden items in rustdoc) - #67887 (`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` have `#[track_caller]`) - #67955 (rustdoc: Remove more `#[doc(cfg(..))]` duplicates) - #67977 (Updates for VxWorks) - #67985 (Remove insignificant notes from CStr documentation) - #68003 (ci: fix wrong shared.sh import for publish_toolstate) Failed merges: - #67820 (Parse the syntax described in RFC 2632) - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup) r? @ghost

bors · 2020-01-08T22:55:29Z

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing caa231d to master...

rust-highfive · 2020-01-08T22:57:02Z

Your PR failed (pretty log, 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.

2020-01-08T22:56:03.2819223Z ##[command]git config gc.auto 0
2020-01-08T22:56:03.2821795Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-08T22:56:03.2823890Z ##[command]git config --get-all http.proxy
2020-01-08T22:56:03.2826908Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin
2020-01-08T22:56:03.3816399Z remote: du: cannot access 'objects/tmp_object_git2_A6FMZv': No such file or directory

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)

matklad and others added 28 commits January 2, 2020 04:02

add a check for variable names that might match by word

91334e0

missed tidy check

27ea4c8

add ui test

e01e8b9

Option's panics are all #[track_caller].

2e9d573

Also includes a simple test with a custom panic hook to ensure we don't regress.

Result's panics have #[track_caller].

7a6af7e

Fix typo

b97ee0f

Co-Authored-By: lzutao <taolzu@gmail.com>

Add more nuanced advice about spin_loop_hint

b25eeef

Remove weak.rs for VxWorks

012127b

rustdoc: Remove more #[doc(cfg(..))] duplicates

86b9d49

ignore signal SIGPIPE

cec957e

Skip caller location test in wasm32.

3acd346

Remove insignificant notes from CStr documentation

48add54

These notes are about a distinction that is not going to be observable in the API. Whether or not the UTF-8 check knows the string length ahead of time, these methods require linear time.

Try statx for all linux-gnu targets

f5baa03

Move constness.rs to librustc_mir.

588296a

Move is_min_const_fn query to librustc_mir.

c1c09be

The only two uses of the associated methods are in librustc_mir and librustdoc. Please tell me if there is a better choice.

ci: fix wrong shared.sh import for publish_toolstate

aabc736

Rollup merge of rust-lang#67781 - cjgillot:passes-const, r=oli-obk

b85b1dd

Move `is_min_const_fn` query to librustc_mir. The only two uses of the associated methods are in `librustc_mir` and `librustdoc`. Please tell me if there is a better choice. cc rust-lang#65031

Rollup merge of rust-lang#67955 - ollie27:rustdoc_cfg_dupes, r=Guilla…

1f94425

…umeGomez rustdoc: Remove more `#[doc(cfg(..))]` duplicates This is a follow up to rust-lang#66959. r? @GuillaumeGomez

Rollup merge of rust-lang#67977 - Wind-River:master_2020, r=alexcrichton

b687461

Updates for VxWorks r? @alexcrichton

Rollup merge of rust-lang#68003 - pietroalbini:yet-another-toolstate-…

844530e

…fix, r=Mark-Simulacrum ci: fix wrong shared.sh import for publish_toolstate r? @Mark-Simulacrum

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 8, 2020

JohnTitor added the rollup A PR which is a rollup label Jan 8, 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 Jan 8, 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 Jan 8, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 8, 2020

bors merged commit 844530e into rust-lang:master Jan 8, 2020

bors mentioned this pull request Jan 8, 2020

Move some queries from rustc::ty to librustc_ty. #67780

Merged

JohnTitor deleted the rollup-44s8twu branch January 8, 2020 23:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #68011

Rollup of 10 pull requests #68011

JohnTitor commented Jan 8, 2020

JohnTitor commented Jan 8, 2020

bors commented Jan 8, 2020

JohnTitor commented Jan 8, 2020

bors commented Jan 8, 2020

rust-highfive commented Jan 8, 2020

JohnTitor commented Jan 8, 2020

bors commented Jan 8, 2020

JohnTitor commented Jan 8, 2020

bors commented Jan 8, 2020

bors commented Jan 8, 2020

rust-highfive commented Jan 8, 2020

Rollup of 10 pull requests #68011

Rollup of 10 pull requests #68011

Conversation

JohnTitor commented Jan 8, 2020

JohnTitor commented Jan 8, 2020

bors commented Jan 8, 2020

JohnTitor commented Jan 8, 2020

bors commented Jan 8, 2020

rust-highfive commented Jan 8, 2020

JohnTitor commented Jan 8, 2020

bors commented Jan 8, 2020

JohnTitor commented Jan 8, 2020

bors commented Jan 8, 2020

bors commented Jan 8, 2020

rust-highfive commented Jan 8, 2020