Rollup of 8 pull requests #100937

JohnTitor · 2022-08-24T01:23:37Z

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})
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

High traffic macros should detail this helpful addition.

...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_

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-24T01:23:50Z

@bors r+ p=8 rollup=never

bors · 2022-08-24T01:23:51Z

📌 Commit 8549096 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2022-08-24T04:06:57Z

⌛ Testing commit 8549096 with merge fdc3a4d41f8dba8f78ebb628b2cd6213d385c91d...

bors · 2022-08-24T05:34:38Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-08-24T06:23:16Z

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

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

test [debuginfo-lldb] src/test/debuginfo/vec.rs ... ok

failures:

---- [debuginfo-lldb] src/test/debuginfo/numeric-types.rs stdout ----
NOTE: compiletest thinks it is using LLDB version 1300
NOTE: compiletest thinks it is using LLDB without native rust support

error: line not found in debugger output: [...]$0 = 11
status: exit status: 0
command: "/usr/bin/python3" "/Users/runner/work/rust/rust/src/etc/lldb_batchmode.py" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/debuginfo/numeric-types.lldb/a" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/debuginfo/numeric-types.lldb/numeric-types.debugger.script"
--- stdout -------------------------------
LLDB batch-mode script
----------------------
Debugger commands script is '/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/debuginfo/numeric-types.lldb/numeric-types.debugger.script'.
Target executable is '/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/debuginfo/numeric-types.lldb/a'.
Current working directory is '/Users/runner/work/rust/rust'
Creating a target for '/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/debuginfo/numeric-types.lldb/a'
settings set auto-confirm true
version
version
lldb-1300.0.42.3 Swift version 5.5.2-dev 
command script import /Users/runner/work/rust/rust/./src/etc/lldb_lookup.py
type synthetic add -l lldb_lookup.synthetic_lookup -x '.*' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(alloc::([a-z_]+::)+)String$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^&(mut )?str$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^&(mut )?\[.+\]$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(std::ffi::([a-z_]+::)+)OsString$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(alloc::([a-z_]+::)+)Vec<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(alloc::([a-z_]+::)+)VecDeque<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(alloc::([a-z_]+::)+)BTreeSet<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(alloc::([a-z_]+::)+)BTreeMap<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(std::collections::([a-z_]+::)+)HashMap<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(std::collections::([a-z_]+::)+)HashSet<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(alloc::([a-z_]+::)+)Rc<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(alloc::([a-z_]+::)+)Arc<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(core::([a-z_]+::)+)Cell<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(core::([a-z_]+::)+)Ref<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(core::([a-z_]+::)+)RefMut<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^(core::([a-z_]+::)+)RefCell<.+>$' --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h '^core::num::([a-z_]+::)*NonZero.+$' --category Rust
type category enable Rust

breakpoint set --file 'numeric-types.rs' --line 288
DEBUG: breakpoint added, id = 1
Breakpoint 1: where = a`numeric_types::main::h0759cd9c4a18020f + 963 at numeric-types.rs:288:5, address = 0x00000001000030f3 
DEBUG: registering breakpoint callback, id = 1
Error while trying to register breakpoint callback, id = 1, message = error: could not get num args: can't find callable: breakpoint_callback
run
run
Process 96821 stopped * thread #1, name = 'main', queue = 'com.apple.main-thread', stop reason = breakpoint 1.1 frame #0: 0x00000001000030f3 a`numeric_types::main::h0759cd9c4a18020f at numeric-types.rs:288:5 285 let a_u64 = AtomicU64::new(512); 286 let a_usize = AtomicUsize::new(1024); 287 -> 288 zzz(); // #break ^ 289 } 290 291 fn zzz() { } Target 0: (a) stopped. Process 96821 launched: '/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/debuginfo/numeric-types.lldb/a' (x86_64) 
print nz_i8
(core::num::nonzero::NonZeroI8) $0 = '\v' { __0 = '\v' } 
print nz_i16
(core::num::nonzero::NonZeroI16) $1 = 22 { __0 = 22 } 
print nz_i32
(core::num::nonzero::NonZeroI32) $2 = 33 { __0 = 33 } 
print nz_i64
(core::num::nonzero::NonZeroI64) $3 = 44 { __0 = 44 } 
print nz_i128
(core::num::nonzero::NonZeroI128) $4 = 55 { __0 = 55 } 
print nz_isize
(core::num::nonzero::NonZeroIsize) $5 = 66 { __0 = 66 } 
print nz_u8
(core::num::nonzero::NonZeroU8) $6 = 'M' { __0 = 'M' } 
print nz_u16
(core::num::nonzero::NonZeroU16) $7 = 88 { __0 = 88 } 
print nz_u32
(core::num::nonzero::NonZeroU32) $8 = 99 { __0 = 99 } 
print nz_u64
(core::num::nonzero::NonZeroU64) $9 = 100 { __0 = 100 } 
print nz_u128
(core::num::nonzero::NonZeroU128) $10 = 111 { __0 = 111 } 
print nz_usize
(core::num::nonzero::NonZeroUsize) $11 = 122 { __0 = 122 } 
------------------------------------------
stderr: none

artemmukhin and others added 16 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

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…

df592af

…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#100901 - TaKO8Ki:make-some-methods-private,…

07aa248

… r=sanxiyn Make some methods private

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

4dede7a

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 24, 2022

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 Aug 24, 2022

matthiaskrgr mentioned this pull request Aug 24, 2022

Add GDB/LLDB pretty-printers for NonZero types #98301

Merged

matthiaskrgr closed this Aug 24, 2022

JohnTitor deleted the rollup-n6axbdc branch June 25, 2023 14:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests #100937

Rollup of 8 pull requests #100937

Uh oh!

JohnTitor commented Aug 24, 2022

Uh oh!

JohnTitor commented Aug 24, 2022

Uh oh!

bors commented Aug 24, 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 8 pull requests #100937

Rollup of 8 pull requests #100937

Uh oh!

Conversation

JohnTitor commented Aug 24, 2022

Uh oh!

JohnTitor commented Aug 24, 2022

Uh oh!

bors commented Aug 24, 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!