diff options
| author | bors <bors@rust-lang.org> | 2019-08-27 00:07:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-27 00:07:38 +0000 |
| commit | 0444b9f66acb5da23dc816e0d8eb59623ba9ea50 (patch) | |
| tree | 3121696aba5740b9bb02879924f6997b51b6785e /src/libstd/sys | |
| parent | 9b91b9c10e3c87ed333a1e34c4f46ed68f1eee06 (diff) | |
| parent | 9c5c124d788962a65198e1e45987b094fd356914 (diff) | |
| download | rust-0444b9f66acb5da23dc816e0d8eb59623ba9ea50.tar.gz rust-0444b9f66acb5da23dc816e0d8eb59623ba9ea50.zip | |
Auto merge of #63926 - Centril:rollup-6kckn9n, r=Centril
Rollup of 6 pull requests Successful merges: - #63317 (Do not complain about unused code when used in `impl` `Self` type) - #63693 (Fully implement or-pattern parsing) - #63836 (VxWorks does not provide a way to set the task name except at creation time) - #63845 (Removed a confusing FnOnce example) - #63855 (Refactor feature gates) - #63921 (add link to FileCheck docs) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/vxworks/thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/vxworks/thread.rs b/src/libstd/sys/vxworks/thread.rs index 58af8cbe48e..ef896f6a6e8 100644 --- a/src/libstd/sys/vxworks/thread.rs +++ b/src/libstd/sys/vxworks/thread.rs @@ -77,7 +77,7 @@ impl Thread { } pub fn set_name(_name: &CStr) { - assert!(false, "FIXME: set_name"); + // VxWorks does not provide a way to set the task name except at creation time } pub fn sleep(dur: Duration) { |