Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 5 pull requests #125320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 21 commits into from
Closed

Rollup of 5 pull requests #125320

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
05f77d1
Update `unexpected_cfgs` lint for Cargo new `check-cfg` config
Urgau May 16, 2024
e6396bc
Use a single static for all default slice Arcs.
zachs18 May 11, 2024
2dacd70
Fix stacked borrows violation
zachs18 May 19, 2024
7cb84fb
Prefer suggesting string-literal for Cargo `check-cfg` lint config
Urgau May 16, 2024
b5ec9bb
Add Cargo specific doc regarding his interaction with `--check-cfg`
Urgau May 16, 2024
3b47f4c
Refer to the Cargo specific doc in the check-cfg diagnostics
Urgau May 17, 2024
bc8e034
Link to the check-cfg doc section in the `unexpected_cfgs` lint doc
Urgau May 17, 2024
6fae171
fmt
zachs18 May 19, 2024
58f8ed1
cfg-out unused code under no_global_oom_handling
zachs18 May 19, 2024
3299823
Fix typo in assert message
zachs18 May 19, 2024
91685c0
Make search graph generic over interner
compiler-errors May 18, 2024
9dc073a
Make EvalCtxt generic over interner
compiler-errors May 18, 2024
dbfed2c
Add failing test for cross-crate enum in type alias
compiler-errors May 20, 2024
090dbb1
Don't strip items with inherited visibility in AliasedNonLocalStripper
compiler-errors May 20, 2024
4654e87
Fix `tests/debuginfo/strings-and-strs`.
nnethercote May 20, 2024
ccd3e99
Fix quote escaping inside check-cfg value
Urgau May 20, 2024
86e0458
Rollup merge of #125219 - Urgau:check-cfg-cargo-config, r=fmease
matthiaskrgr May 20, 2024
81744f1
Rollup merge of #125255 - compiler-errors:eval-ctxt-generic, r=lcnr
matthiaskrgr May 20, 2024
78db21b
Rollup merge of #125283 - zachs18:arc-default-shared, r=dtolnay
matthiaskrgr May 20, 2024
e667eb6
Rollup merge of #125300 - compiler-errors:dont-strip-inherited-viz, r…
matthiaskrgr May 20, 2024
b937bd3
Rollup merge of #125309 - nnethercote:fix-strings-and-strs, r=Mark-Si…
matthiaskrgr May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests/debuginfo/strings-and-strs. 
It fails on my machine because it embeds pointer addresses in the
expected output.

This commit replaces the addresses with `0x[...]`.
  • Loading branch information
@nnethercote
nnethercote committed May 20, 2024
commit 4654e87d4c6c80f737d486ae15c0eeebb77269ed
4 changes: 2 additions & 2 deletions tests/debuginfo/strings-and-strs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// gdb-command:run

// gdb-command:print plain_string
// gdbr-check:$1 = alloc::string::String {vec: alloc::vec::Vec<u8, alloc::alloc::Global> {buf: alloc::raw_vec::RawVec<u8, alloc::alloc::Global> {ptr: core::ptr::unique::Unique<u8> {pointer: core::ptr::non_null::NonNull<u8> {pointer: 0x55555555ab80}, _marker: core::marker::PhantomData<u8>}, cap: alloc::raw_vec::Cap (5), alloc: alloc::alloc::Global}, len: 5}}
// gdbr-check:$1 = alloc::string::String {vec: alloc::vec::Vec<u8, alloc::alloc::Global> {buf: alloc::raw_vec::RawVec<u8, alloc::alloc::Global> {ptr: core::ptr::unique::Unique<u8> {pointer: core::ptr::non_null::NonNull<u8> {pointer: 0x[...]}, _marker: core::marker::PhantomData<u8>}, cap: alloc::raw_vec::Cap (5), alloc: alloc::alloc::Global}, len: 5}}

// gdb-command:print plain_str
// gdbr-check:$2 = "Hello"
Expand All @@ -19,7 +19,7 @@
// gdbr-check:$4 = ("Hello", "World")

// gdb-command:print str_in_rc
// gdbr-check:$5 = alloc::rc::Rc<&str, alloc::alloc::Global> {ptr: core::ptr::non_null::NonNull<alloc::rc::RcBox<&str>> {pointer: 0x55555555aae0}, phantom: core::marker::PhantomData<alloc::rc::RcBox<&str>>, alloc: alloc::alloc::Global}
// gdbr-check:$5 = alloc::rc::Rc<&str, alloc::alloc::Global> {ptr: core::ptr::non_null::NonNull<alloc::rc::RcBox<&str>> {pointer: 0x[...]}, phantom: core::marker::PhantomData<alloc::rc::RcBox<&str>>, alloc: alloc::alloc::Global}


// === LLDB TESTS ==================================================================================
Expand Down