Rollup of 9 pull requests #100931

JohnTitor · 2022-08-23T22:35:50Z

Successful merges:

Add GDB/LLDB pretty-printers for NonZero types #98301 (Add GDB/LLDB pretty-printers for NonZero types)
Properly forward ByRefSized::fold to the inner iterator #100220 (Properly forward ByRefSized::fold to the inner iterator)
Fix wrong compiletest filters on Windows #100811 (Fix wrong compiletest filters on Windows)
Make use of [wrapping_]byte_{add,sub} #100819 (Make use of [wrapping_]byte_{add,sub})
Use getuid to check instead of USER env var in rustbuild #100852 (Use getuid to check instead of USER env var in rustbuild)
Extra documentation for new formatting feature #100855 (Extra documentation for new formatting feature)
Make some methods private #100901 (Make some methods private)
Diagnose missing includes in run-make tests #100912 (Diagnose missing includes in run-make tests)
Use --userns=keep-id when "docker" is really podman #100930 (Use --userns=keep-id when "docker" is really podman)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

High traffic macros should detail this helpful addition.

This makes it consistent with `x.py` as changed in rust-lang#95671 Fixes rust-lang#100459

...replacing `.cast().wrapping_offset().cast()` & similar code.

Rootless podman creates a separate user namespace, where an inner `LOCAL_USER_ID` will map to a different subuid range on the host. The "keep-id" mode maps the current UID directly into the container. This makes `src/ci/docker/run.sh` work better for testing container images on systems running podman, where "docker" is just a shim.

…sleywiser Add GDB/LLDB pretty-printers for NonZero types Add GDB/LLDB pretty-printers for `NonZero` types. These pretty-printers were originally implemented for IntelliJ Rust by `@Kobzol` in intellij-rust/intellij-rust#5270. Part of rust-lang#29392.

…riplett Properly forward `ByRefSized::fold` to the inner iterator cc `@timvermeulen,` who noticed this mistake in rust-lang#100214 (comment)

Fix wrong compiletest filters on Windows As discussed in [rust-lang#79334](rust-lang#79334), when calling e.g. ``` python x.py test src/test/ui/expr/compound-assignment/eval-order.rs ``` on Windows, compiletest passes the filter `expr/compound-assignment/eval-order.rs` to libtest, which instead should be `expr\compound-assignment\eval-order.rs`, as that is the file found when collecting tests. This is what I fixed. I'm not sure how to organize a test for this. Any suggestions?

… r=scottmcm Make use of `[wrapping_]byte_{add,sub}` These new methods trivially replace old `.cast().wrapping_offset().cast()` & similar code. Note that [`arith_offset`](https://doc.rust-lang.org/std/intrinsics/fn.arith_offset.html) and `wrapping_offset` are the same thing. r? `@scottmcm` _split off from #100746_

…lacrum Use `getuid` to check instead of `USER` env var in rustbuild This makes it consistent with `x.py` as changed in rust-lang#95671 Fixes rust-lang#100459

Extra documentation for new formatting feature Documentation of this feature was added in rust-lang#90473 and released in Rust 1.58. However, high traffic macros did not receive new examples. Namely `println!()` and `format!()`. The doc comments included in Rust are super important to the community- especially newcomers. I have met several other newbies like myself who are unaware of this recent (well about 7 months old now) update to the language allowing for convenient intra-string identifiers. Bringing small examples of this feature to the doc comments of `println!()` and `format!()` would be helpful to everyone learning the language. [Blog Post Announcing Feature](https://blog.rust-lang.org/2022/01/13/Rust-1.58.0.html) [Feature PR](rust-lang#90473) - includes several instances of documentation of the feature- minus the macros in question for this PR *This is my first time contributing to a project this large. Feedback would mean the world to me 😄* --- *Recreated; I violated the [No-Merge Policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy)*

… r=sanxiyn Make some methods private

Diagnose missing includes in run-make tests

Use `--userns=keep-id` when "docker" is really podman Rootless podman creates a separate user namespace, where an inner `LOCAL_USER_ID` will map to a different subuid range on the host. The "keep-id" mode maps the current UID directly into the container. This makes `src/ci/docker/run.sh` work better for testing container images on systems running podman, where "docker" is just a shim.

JohnTitor · 2022-08-23T22:36:04Z

@bors r+ p=9 rollup=never

bors · 2022-08-23T22:36:06Z

📌 Commit 9ce0c3a has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2022-08-24T01:11:16Z

⌛ Testing commit 9ce0c3a with merge e617d283e3c048d9278e584a5849d23b38e9de8e...

bors · 2022-08-24T01:17:43Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-08-24T01:21:37Z

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

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

   Compiling walkdir v2.3.2
   Compiling ignore v0.4.18
   Compiling toml v0.5.9
   Compiling xz2 v0.1.6
error[E0425]: cannot find function `getuid` in crate `libc`
    |
    |
403 |                 let uid = unsafe { libc::getuid() };
    |                                          ^^^^^^ help: a function with a similar name exists: `getpid`
   ::: C:\Users\runneradmin\.cargo\registry\src\github.heygears.com-1ecc6299db9ec823\libc-0.2.126\src\windows\mod.rs:474:5
    |
474 |     pub fn getpid() -> ::c_int;
474 |     pub fn getpid() -> ::c_int;
    |     -------------------------- similarly named function `getpid` defined here
For more information about this error, try `rustc --explain E0425`.
error: could not compile `bootstrap` due to previous error
failed to run: D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0\bin\cargo.exe build --manifest-path D:\a\rust\rust\src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:01:34
Build completed unsuccessfully in 0:01:34
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 2/5:
Building rustbuild
   Compiling bootstrap v0.0.0 (D:\a\rust\rust\src\bootstrap)
error[E0425]: cannot find function `getuid` in crate `libc`
    |
    |
403 |                 let uid = unsafe { libc::getuid() };
    |                                          ^^^^^^ help: a function with a similar name exists: `getpid`
   ::: C:\Users\runneradmin\.cargo\registry\src\github.heygears.com-1ecc6299db9ec823\libc-0.2.126\src\windows\mod.rs:474:5
    |
474 |     pub fn getpid() -> ::c_int;
474 |     pub fn getpid() -> ::c_int;
    |     -------------------------- similarly named function `getpid` defined here
For more information about this error, try `rustc --explain E0425`.
error: could not compile `bootstrap` due to previous error
failed to run: D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0\bin\cargo.exe build --manifest-path D:\a\rust\rust\src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:00:02
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 3/5:
Building rustbuild
   Compiling bootstrap v0.0.0 (D:\a\rust\rust\src\bootstrap)
error[E0425]: cannot find function `getuid` in crate `libc`
    |
    |
403 |                 let uid = unsafe { libc::getuid() };
    |                                          ^^^^^^ help: a function with a similar name exists: `getpid`
   ::: C:\Users\runneradmin\.cargo\registry\src\github.heygears.com-1ecc6299db9ec823\libc-0.2.126\src\windows\mod.rs:474:5
    |
474 |     pub fn getpid() -> ::c_int;
474 |     pub fn getpid() -> ::c_int;
    |     -------------------------- similarly named function `getpid` defined here
For more information about this error, try `rustc --explain E0425`.
error: could not compile `bootstrap` due to previous error
failed to run: D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0\bin\cargo.exe build --manifest-path D:\a\rust\rust\src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:00:02
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 4/5:
Building rustbuild
   Compiling bootstrap v0.0.0 (D:\a\rust\rust\src\bootstrap)
error[E0425]: cannot find function `getuid` in crate `libc`
    |
    |
403 |                 let uid = unsafe { libc::getuid() };
    |                                          ^^^^^^ help: a function with a similar name exists: `getpid`
   ::: C:\Users\runneradmin\.cargo\registry\src\github.heygears.com-1ecc6299db9ec823\libc-0.2.126\src\windows\mod.rs:474:5
    |
474 |     pub fn getpid() -> ::c_int;
474 |     pub fn getpid() -> ::c_int;
    |     -------------------------- similarly named function `getpid` defined here
For more information about this error, try `rustc --explain E0425`.
error: could not compile `bootstrap` due to previous error
failed to run: D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0\bin\cargo.exe build --manifest-path D:\a\rust\rust\src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:00:02
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 5/5:
Building rustbuild
   Compiling bootstrap v0.0.0 (D:\a\rust\rust\src\bootstrap)
error[E0425]: cannot find function `getuid` in crate `libc`
    |
    |
403 |                 let uid = unsafe { libc::getuid() };
    |                                          ^^^^^^ help: a function with a similar name exists: `getpid`
   ::: C:\Users\runneradmin\.cargo\registry\src\github.heygears.com-1ecc6299db9ec823\libc-0.2.126\src\windows\mod.rs:474:5
    |
474 |     pub fn getpid() -> ::c_int;
474 |     pub fn getpid() -> ::c_int;
    |     -------------------------- similarly named function `getpid` defined here
For more information about this error, try `rustc --explain E0425`.
error: could not compile `bootstrap` due to previous error
failed to run: D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0\bin\cargo.exe build --manifest-path D:\a\rust\rust\src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:00:02

artemmukhin and others added 18 commits June 29, 2022 17:39

Add GDB/LLDB pretty-printers for NonZero types

bc6049a

Properly forward ByRefSized::fold to the inner iterator

7680c8b

Correct test-args to compiletest on Windows

8998024

Extra documentation for new formatting feature

acca4b8

High traffic macros should detail this helpful addition.

make some methods private

000dc80

Use getuid to check instead of USER env var in rustbuild

9fc23bb

This makes it consistent with `x.py` as changed in rust-lang#95671 Fixes rust-lang#100459

Diagnose missing includes in run-make tests

ba74a62

Make use of [wrapping_]byte_{add,sub}

53565b2

...replacing `.cast().wrapping_offset().cast()` & similar code.

Rollup merge of rust-lang#100220 - scottmcm:fix-by-ref-sized, r=josht…

d662b9c

…riplett Properly forward `ByRefSized::fold` to the inner iterator cc `@timvermeulen,` who noticed this mistake in rust-lang#100214 (comment)

Rollup merge of rust-lang#100852 - Samyak2:samyak/100459, r=Mark-Simu…

b2407ea

…lacrum Use `getuid` to check instead of `USER` env var in rustbuild This makes it consistent with `x.py` as changed in rust-lang#95671 Fixes rust-lang#100459

Rollup merge of rust-lang#100901 - TaKO8Ki:make-some-methods-private,…

f123b8d

… r=sanxiyn Make some methods private

Rollup merge of rust-lang#100912 - tmiasko:make-include, r=TaKO8Ki

d9fd2c4

Diagnose missing includes in run-make tests

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 23, 2022

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 24, 2022

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 24, 2022

JohnTitor mentioned this pull request Aug 24, 2022

Use getuid to check instead of USER env var in rustbuild #100852

Merged

JohnTitor closed this Aug 24, 2022

JohnTitor deleted the rollup-t8q08tg branch August 24, 2022 01:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 9 pull requests #100931

Rollup of 9 pull requests #100931

Uh oh!

JohnTitor commented Aug 23, 2022

Uh oh!

JohnTitor commented Aug 23, 2022

Uh oh!

bors commented Aug 23, 2022

Uh oh!

bors commented Aug 24, 2022

Uh oh!

bors commented Aug 24, 2022

Uh oh!

rust-log-analyzer commented Aug 24, 2022

Uh oh!

Uh oh!

Rollup of 9 pull requests #100931

Rollup of 9 pull requests #100931

Uh oh!

Conversation

JohnTitor commented Aug 23, 2022

Uh oh!

JohnTitor commented Aug 23, 2022

Uh oh!

bors commented Aug 23, 2022

Uh oh!

bors commented Aug 24, 2022

Uh oh!

bors commented Aug 24, 2022

Uh oh!

rust-log-analyzer commented Aug 24, 2022

Uh oh!

Uh oh!