Rollup of 6 pull requests #87149

JohnTitor · 2021-07-15T04:53:17Z

Successful merges:

Add -Zfuture-incompat-test to assist with testing future-incompat reports. #86478 (Add -Zfuture-incompat-test to assist with testing future-incompat reports.)
Move assert_matches to an inner module #86947 (Move assert_matches to an inner module)
Add tracking issue number to wasi_ext #87081 (Add tracking issue number to wasi_ext)
Add safety comments in private core::slice::rotate::ptr_rotate function #87127 (Add safety comments in private core::slice::rotate::ptr_rotate function)
Make SelfInTyParamDefault wording not be specific to type defaults #87134 (Make SelfInTyParamDefault wording not be specific to type defaults)
Update cargo #87147 (Update cargo)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…orts.

Add -Zfuture-incompat-test to assist with testing future-incompat reports. This adds a `-Zfuture-incompat-test` cli flag to assist with testing future-incompatible reports. This flag causes all lints to be treated as a future-incompatible lint, and will emit a report for them. This is being added so that Cargo's testsuite can reliably test the reporting infrastructure. Right now, Cargo relies on using array_into_iter as a test subject. Since the breaking "future incompatible" lints are never intended to last forever, this means Cargo's testsuite would always need to keep changing to choose different lints (for example, rust-lang#86330 proposed dropping that moniker for array_into_iter). With this flag, Cargo's tests can trigger any lint and check for the report.

…, r=yaahc Move assert_matches to an inner module Fixes rust-lang#82913

… r=dtolnay Add tracking issue number to `wasi_ext` Feature `wasi_ext` is tracked by rust-lang#71213 but is was not in the source code.

…cottmcm Add safety comments in private core::slice::rotate::ptr_rotate function Helps with rust-lang#66219. ``@rustbot`` label C-cleanup T-compiler T-libs

Make SelfInTyParamDefault wording not be specific to type defaults r? ``@lcnr``

Update cargo 13 commits in 3ebb5f15a940810f250b68821149387af583a79e..66a6737a0c9f3a974af2dd032a65d3e409c77aac 2021-07-02 20:35:38 +0000 to 2021-07-14 20:54:28 +0000 - Add format option to `cargo tree` to print the lib_name (rust-lang/cargo#9663) - Prefer patched versions of dependencies (rust-lang/cargo#9639) - When a dependency does not have a version, git or path, fails directly (rust-lang/cargo#9686) - Spot the crate typo easily (rust-lang/cargo#9665) - remove unnecessary 'collect' (rust-lang/cargo#9616) - Make it easier to run testsuite with a custom toolchain. (rust-lang/cargo#9679) - Serialize `cargo fix` (rust-lang/cargo#9677) - Don't recommend filing issues on rust-lang/cargo for Cargo.toml errors. (rust-lang/cargo#9658) - Update nightly failure notification. (rust-lang/cargo#9657) - Update Windows env uppercase key check. (rust-lang/cargo#9654) - Unignore fix_edition_2021. (rust-lang/cargo#9662) - Warning when using features in patch (rust-lang/cargo#9666) - Unify cargo and rustc's error reporting (rust-lang/cargo#9655)

JohnTitor · 2021-07-15T04:53:33Z

@bors r+ p=6 rollup=never

bors · 2021-07-15T04:53:34Z

📌 Commit 6e785f9 has been approved by JohnTitor

bors · 2021-07-15T05:23:01Z

⌛ Testing commit 6e785f9 with merge f86834050e98d3cd49834d98733b595b59646ca9...

rust-log-analyzer · 2021-07-15T07:07:54Z

The job dist-x86_64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


error: failed to run custom build command for `libz-sys v1.1.2`

Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/release/build/libz-sys-57710a7f3f3c39a1/build-script-build` (exit status: 1)
  --- stdout
  cargo:rerun-if-env-changed=LIBZ_SYS_STATIC
  cargo:rerun-if-changed=build.rs
  TARGET = Some("x86_64-apple-darwin")
  OPT_LEVEL = Some("0")
  HOST = Some("x86_64-apple-darwin")
  CC_x86_64-apple-darwin = Some("sccache /Users/runner/work/rust/rust/clang+llvm-12.0.0-x86_64-apple-darwin/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/rust/rust=/rustc/f86834050e98d3cd49834d98733b595b59646ca9")
  CRATE_CC_NO_DEFAULTS = None
  DEBUG = Some("false")
  running: "sccache" "/Users/runner/work/rust/rust/clang+llvm-12.0.0-x86_64-apple-darwin/bin/clang" "-O0" "-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/rust/rust=/rustc/f86834050e98d3cd49834d98733b595b59646ca9" "-I" "src/zlib" "-fvisibility=hidden" "-DSTDC" "-D_LARGEFILE64_SOURCE" "-D_POSIX_SOURCE" "-D_C99_SOURCE" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/release/build/libz-sys-25738435a1dfcb3d/out/build/src/zlib/adler32.o" "-c" "src/zlib/adler32.c"
  cargo:warning=error: Connection to server timed out
  exit status: 2
  running: "sccache" "/Users/runner/work/rust/rust/clang+llvm-12.0.0-x86_64-apple-darwin/bin/clang" "-O0" "-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/rust/rust=/rustc/f86834050e98d3cd49834d98733b595b59646ca9" "-I" "src/zlib" "-fvisibility=hidden" "-DSTDC" "-D_LARGEFILE64_SOURCE" "-D_POSIX_SOURCE" "-D_C99_SOURCE" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/release/build/libz-sys-25738435a1dfcb3d/out/build/src/zlib/compress.o" "-c" "src/zlib/compress.c"

  --- stderr



  error occurred: Command "sccache" "/Users/runner/work/rust/rust/clang+llvm-12.0.0-x86_64-apple-darwin/bin/clang" "-O0" "-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/rust/rust=/rustc/f86834050e98d3cd49834d98733b595b59646ca9" "-I" "src/zlib" "-fvisibility=hidden" "-DSTDC" "-D_LARGEFILE64_SOURCE" "-D_POSIX_SOURCE" "-D_C99_SOURCE" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/release/build/libz-sys-25738435a1dfcb3d/out/build/src/zlib/adler32.o" "-c" "src/zlib/adler32.c" with args "clang" did not execute successfully (status code exit status: 2).

warning: build failed, waiting for other jobs to finish...
The following warnings were emitted during compilation:

JohnTitor · 2021-07-15T07:09:43Z

error: Connection to server timed out

@bors retry

bors · 2021-07-15T07:09:52Z

⌛ Testing commit 6e785f9 with merge 29455c646a8f99cd762e0710ab356a7fdbf2c825...

rust-log-analyzer · 2021-07-15T09:44:15Z

The job x86_64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

      Memory: 14 GB
      Boot ROM Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMt/TeasCfea

hw.ncpu: 3
hw.byteorder: 1234
hw.memsize: 15032385536
---
    Finished release [optimized] target(s) in 1.18s
[TIMING] ToolBuild { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-apple-darwin", file: None } }, target: TargetSelection { triple: "x86_64-apple-darwin", file: None }, tool: "html-checker", path: "src/tools/html-checker", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 1.204
[TIMING] HtmlChecker { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-apple-darwin", file: None } }, target: TargetSelection { triple: "x86_64-apple-darwin", file: None } } -- 0.000
Running HTML checker...
=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/core/index.html` (error code: 1) <=
line 39 column 36 - Warning: <a> attribute "rev" not allowed for HTML5 (MISMATCHED_ATTRIBUTE_WARN)
Error: "HTML check failed: 1 errors"
Done! Read 26513 files...

JohnTitor · 2021-07-15T09:49:11Z

Seems it failed on rustdoc tests but it doesn't contain any changes related to rustdoc, I think. Spurious?
@bors retry

bors · 2021-07-15T09:49:21Z

⌛ Testing commit 6e785f9 with merge d24a6e8236b3c2fba0a8dc9129c82f358eca400b...

JohnTitor · 2021-07-15T09:52:51Z

cc @GuillaumeGomez Is the above failure actually spurious?

GuillaumeGomez · 2021-07-15T11:00:58Z

It's surprising because we don't have changes in documentation in this rollup that might generate such an attribute on a <a> tag... Going to investigate just in case.

GuillaumeGomez · 2021-07-15T11:01:58Z

Ah hold on! Found it in src/librustdoc/html/markdown.rs at line 624. Sending a fix.

rust-log-analyzer · 2021-07-15T12:17:03Z

The job x86_64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

      Memory: 14 GB
      Boot ROM Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMldzh1W4tF6

hw.ncpu: 3
hw.byteorder: 1234
hw.memsize: 15032385536
---
    Finished release [optimized] target(s) in 1.15s
[TIMING] ToolBuild { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-apple-darwin", file: None } }, target: TargetSelection { triple: "x86_64-apple-darwin", file: None }, tool: "html-checker", path: "src/tools/html-checker", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 1.174
[TIMING] HtmlChecker { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-apple-darwin", file: None } }, target: TargetSelection { triple: "x86_64-apple-darwin", file: None } } -- 0.000
Running HTML checker...
=> Errors for `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/doc/core/index.html` (error code: 1) <=
line 39 column 36 - Warning: <a> attribute "rev" not allowed for HTML5 (MISMATCHED_ATTRIBUTE_WARN)
Error: "HTML check failed: 1 errors"
Done! Read 26513 files...

bors · 2021-07-15T12:17:32Z

💔 Test failed - checks-actions

Fix misuse of rev attribute on <a> tag The `rev` attribute is supposed to talk about "ownership" as far as I could found out. This attribute seems not very well defined in the HTML spec and its usage in rustdoc is suboptimal. It was found out in rust-lang#87149. r? `@JohnTitor`

m-ou-se and others added 13 commits July 8, 2021 02:33

Move [debug_]assert_matches to mod {core, std}::assert.

e304443

Add tracking issue number to wasi_ext

6e47c8d

Add safety comments in private core::slice::rotate::ptr_rotate function

4541aa9

Add -Zfuture-incompat-test to assist with testing future-incompat rep…

636fcac

…orts.

Change type param -> generic param

da189d9

OOPS

b3b6b66

Update cargo

0c4b2a8

Rollup merge of rust-lang#86947 - m-ou-se:assert-matches-to-submodule…

9b76431

…, r=yaahc Move assert_matches to an inner module Fixes rust-lang#82913

Rollup merge of rust-lang#87081 - a1phyr:add_wasi_ext_tracking_issue,…

623bcd8

… r=dtolnay Add tracking issue number to `wasi_ext` Feature `wasi_ext` is tracked by rust-lang#71213 but is was not in the source code.

Rollup merge of rust-lang#87127 - poliorcetics:ptr-rotate-safety, r=s…

63db307

…cottmcm Add safety comments in private core::slice::rotate::ptr_rotate function Helps with rust-lang#66219. ``@rustbot`` label C-cleanup T-compiler T-libs

Rollup merge of rust-lang#87134 - BoxyUwU:cgd-self-ty-error, r=lcnr

50eeef4

Make SelfInTyParamDefault wording not be specific to type defaults r? ``@lcnr``

rustbot added the rollup A PR which is a rollup label Jul 15, 2021

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 15, 2021

GuillaumeGomez mentioned this pull request Jul 15, 2021

Fix misuse of rev attribute on <a> tag #87154

Merged

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 15, 2021

JohnTitor closed this Jul 15, 2021

JohnTitor deleted the rollup-qnwf3em branch July 15, 2021 12:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #87149

Rollup of 6 pull requests #87149

JohnTitor commented Jul 15, 2021

JohnTitor commented Jul 15, 2021

bors commented Jul 15, 2021

bors commented Jul 15, 2021

rust-log-analyzer commented Jul 15, 2021

JohnTitor commented Jul 15, 2021

bors commented Jul 15, 2021

rust-log-analyzer commented Jul 15, 2021

JohnTitor commented Jul 15, 2021

bors commented Jul 15, 2021

JohnTitor commented Jul 15, 2021

GuillaumeGomez commented Jul 15, 2021

GuillaumeGomez commented Jul 15, 2021

rust-log-analyzer commented Jul 15, 2021

bors commented Jul 15, 2021

Rollup of 6 pull requests #87149

Rollup of 6 pull requests #87149

Conversation

JohnTitor commented Jul 15, 2021

JohnTitor commented Jul 15, 2021

bors commented Jul 15, 2021

bors commented Jul 15, 2021

rust-log-analyzer commented Jul 15, 2021

JohnTitor commented Jul 15, 2021

bors commented Jul 15, 2021

rust-log-analyzer commented Jul 15, 2021

JohnTitor commented Jul 15, 2021

bors commented Jul 15, 2021

JohnTitor commented Jul 15, 2021

GuillaumeGomez commented Jul 15, 2021

GuillaumeGomez commented Jul 15, 2021

rust-log-analyzer commented Jul 15, 2021

bors commented Jul 15, 2021