diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0d89d473..f7c6b2a7 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -47,8 +47,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install Rust - #run: rustup target add ${{ matrix.target }} - run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt + run: rustup target add ${{ matrix.target }} - if: ${{ matrix.is_musl }} name: Install musl-tools run: sudo apt-get install -y musl-tools @@ -78,9 +77,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install Rust - # 1.81 causes issues when running the tests - #run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }} - run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt + run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }} - name: Install cross # Latest cross release 0.2.5 fails to link binaries for the `aarch64-linux-android` target. A release is pending. # Use a specific commit until the release is out. See https://github.com/cross-rs/cross/issues/1222 @@ -106,8 +103,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install Rust - #run: rustup target add ${{ matrix.target }} - run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt + run: rustup target add ${{ matrix.target }} - name: Check run: cargo check --workspace --verbose --target=${{ matrix.target }} - name: Clippy diff --git a/Cargo.lock b/Cargo.lock index 3521a152..f66eb6c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "fallible-iterator", "gimli", @@ -18,18 +18,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -633,6 +621,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -807,9 +801,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" dependencies = [ "fallible-iterator", "stable_deref_trait", @@ -834,20 +828,14 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "foldhash", +] [[package]] name = "heck" @@ -997,7 +985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown", ] [[package]] @@ -1307,13 +1295,13 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "crc32fast", "flate2", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "memchr", "ruzstd", @@ -1379,9 +1367,9 @@ dependencies = [ [[package]] name = "pdb-addr2line" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb51ef7ed9998e108891711812822831daac0b17d67768c3bdc69aa909366123" +checksum = "6f4d9133f33529242bbc22aaaffbd05a7c61712833ecb3a23f50acc1055f2bd5" dependencies = [ "bitflags", "elsa", @@ -1814,9 +1802,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "once_cell", "ring", @@ -2451,12 +2439,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "walkdir" version = "2.5.0" diff --git a/fixtures/snapshots/win64-ci-mozglue.pdb.txt b/fixtures/snapshots/win64-ci-mozglue.pdb.txt index a7ef280b..5f7071d9 100644 --- a/fixtures/snapshots/win64-ci-mozglue.pdb.txt +++ b/fixtures/snapshots/win64-ci-mozglue.pdb.txt @@ -159,7 +159,7 @@ ff10 Allocator::moz_arena_memalign(unsigned long long, unsigned 15990 mozilla::dmd::Options::ValueIfMatch(char const*, char const*) 159d0 mozilla::dmd::Options::GetBool(char const*, char const*, bool*) 15a30 mozilla::dmd::Options::Options(char const*) -15c40 mozilla::detail::CodeAddressServiceAllocPolicy::strdup_(char const*) +15c40 mozilla::dmd::InfallibleAllocPolicy::strdup_(char const*) 15c90 mozilla::dmd::StatusMsg(char const*, ) 15ce0 mozilla::dmd::DMDFuncs::Report(void const*) 15cf0 mozilla::dmd::ReportHelper(void const*, bool) @@ -186,13 +186,13 @@ ff10 Allocator::moz_arena_memalign(unsigned long long, unsigned 18580 mozilla::dmd::LiveBlock::AddStackTracesToTable(mozilla::HashSet,mozilla::dmd::InfallibleAllocPolicy>&) const 18680 mozilla::dmd::DeadBlock::AddStackTracesToTable(mozilla::HashSet,mozilla::dmd::InfallibleAllocPolicy>&) const 186f0 mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::changeTableSize(unsigned int, mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) -18850 mozilla::detail::HashTable >::SetHashPolicy,mozilla::detail::CodeAddressServiceAllocPolicy >::createTable(mozilla::detail::CodeAddressServiceAllocPolicy&, unsigned int, mozilla::detail::HashTable >::SetHashPolicy,mozilla::detail::CodeAddressServiceAllocPolicy >::FailureBehavior) -18980 mozilla::detail::HashTable >::SetHashPolicy,mozilla::detail::CodeAddressServiceAllocPolicy >::findNonLiveSlot(unsigned int) +18850 mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::createTable(mozilla::dmd::InfallibleAllocPolicy&, unsigned int, mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) +18980 mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::findNonLiveSlot(unsigned int) 18a50 mozilla::HashSet,mozilla::dmd::InfallibleAllocPolicy>::put(mozilla::dmd::StackTrace const*&&) 18c90 mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::add(mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::AddPtr&, mozilla::dmd::StackTrace const*&&) -18d50 mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::rehashIfOverloaded(mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) +18d50 mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::rehashIfOverloaded(mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) 18dc0 mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::Iterator::Iterator(mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy> const&) -18e50 mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::Iterator::Iterator(mozilla::detail::HashTable,mozilla::dmd::InfallibleAllocPolicy>::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy> const&) +18e50 mozilla::detail::HashTable::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::Iterator::Iterator(mozilla::detail::HashTable::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy> const&) 18ee0 mozilla::detail::HashTable::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::compact() 18fb0 mozilla::detail::HashTable::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::rehashIfOverloaded(mozilla::detail::HashTable::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) 19020 mozilla::detail::HashTable::SetHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::rehashTableInPlace() @@ -219,8 +219,8 @@ ff10 Allocator::moz_arena_memalign(unsigned long long, unsigned 1a6d0 mozilla::AddToHash(unsigned int, unsigned long long, unsigned long long, mozilla::dmd::StackTrace const*, bool, bool) 1a780 mozilla::dmd::AggregatedLiveBlockHashPolicy::match(mozilla::dmd::LiveBlock const* const&, mozilla::dmd::LiveBlock const* const&) 1a860 mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::add(mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::AddPtr&, mozilla::dmd::LiveBlock const*&&, int&&) -1a930 mozilla::detail::HashTable,mozilla::HashMap,mozilla::dmd::InfallibleAllocPolicy>::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::changeTableSize(unsigned int, mozilla::detail::HashTable,mozilla::HashMap,mozilla::dmd::InfallibleAllocPolicy>::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) -1aa90 mozilla::detail::HashTable,mozilla::HashMap,mozilla::dmd::InfallibleAllocPolicy>::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::findNonLiveSlot(unsigned int) +1a930 mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::changeTableSize(unsigned int, mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) +1aa90 mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::findNonLiveSlot(unsigned int) 1ab60 mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::rehashIfOverloaded(mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) 1abd0 mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::createTable(mozilla::dmd::InfallibleAllocPolicy&, unsigned int, mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::FailureBehavior) 1ace0 mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy>::Iterator::Iterator(mozilla::detail::HashTable,mozilla::HashMap::MapHashPolicy,mozilla::dmd::InfallibleAllocPolicy> const&) @@ -481,7 +481,7 @@ ff10 Allocator::moz_arena_memalign(unsigned long long, unsigned 2f1f0 mozilla::baseprofiler::TracingMarkerPayload::TracingMarkerPayload(char const*, mozilla::baseprofiler::TracingKind, mozilla::Maybe const&, mozilla::UniquePtr) 2f280 mozilla::baseprofiler::ProfilerMarkerPayload::ProfilerMarkerPayload(mozilla::Maybe const&, mozilla::UniquePtr) 2f300 mozilla::baseprofiler::TracingMarkerPayload::TracingMarkerPayload(mozilla::baseprofiler::ProfilerMarkerPayload::CommonProps&&, char const*, mozilla::baseprofiler::TracingKind) -2f360 mozilla::baseprofiler::LongTaskMarkerPayload::~LongTaskMarkerPayload() +2f360 mozilla::baseprofiler::TracingMarkerPayload::~TracingMarkerPayload() 2f3a0 mozilla::baseprofiler::TracingMarkerPayload::TagAndSerializationBytes() const 2f3e0 mozilla::baseprofiler::TracingMarkerPayload::SerializeTagAndPayload(mozilla::ProfileBufferEntryWriter&) const 2f4b0 mozilla::baseprofiler::TracingMarkerPayload::Deserialize(mozilla::ProfileBufferEntryReader&) @@ -617,7 +617,7 @@ ff10 Allocator::moz_arena_memalign(unsigned long long, unsigned 399a0 mozilla::baseprofiler::profiler_tracing_marker(char const*, char const*, mozilla::baseprofiler::ProfilingCategoryPair, mozilla::baseprofiler::TracingKind, mozilla::UniquePtr, mozilla::Maybe const&) 39ad0 mozilla::baseprofiler::profiler_add_text_marker(char const*, std::basic_string,std::allocator > const&, mozilla::baseprofiler::ProfilingCategoryPair, mozilla::TimeStamp const&, mozilla::TimeStamp const&, mozilla::Maybe const&, mozilla::UniquePtr) 39b90 mozilla::baseprofiler::profiler_suspend_and_sample_thread(int, unsigned int, mozilla::baseprofiler::ProfilerStackCollector&, bool) -39e60 mozilla::baseprofiler::LongTaskMarkerPayload::~LongTaskMarkerPayload() +39e60 mozilla::baseprofiler::TracingMarkerPayload::~TracingMarkerPayload() 39ec0 mozilla::baseprofiler::FileIOMarkerPayload::~FileIOMarkerPayload() 39ef0 mozilla::baseprofiler::UserTimingMarkerPayload::~UserTimingMarkerPayload() 39f20 mozilla::baseprofiler::TextMarkerPayload::~TextMarkerPayload() @@ -633,7 +633,7 @@ ff10 Allocator::moz_arena_memalign(unsigned long long, unsigned 3a210 mozilla::ProfileBufferChunkManagerSingle::GetExtantReleasedChunks() 3a230 mozilla::ProfileBufferChunkManagerSingle::SizeOfExcludingThis(unsigned long long (*)(void const*)) const 3a280 mozilla::ProfileBufferChunkManagerSingle::SizeOfIncludingThis(unsigned long long (*)(void const*)) const -3a2b0 mozilla::ProfileBufferChunkManagerWithLocalLimit::MaxTotalSize() const +3a2b0 mozilla::ProfileBufferChunkManagerSingle::PeekExtantReleasedChunksAndLock() 3a2c0 std::_Func_class::_Reset_move(std::_Func_class&&) 3a320 mozilla::ProfileBufferChunk::SizeOfIncludingThis(unsigned long long (*)(void const*)) const 3a370 mozilla::ProfileChunkedBuffer::ResetChunkManager(mozilla::baseprofiler::detail::BaseProfilerMaybeAutoLock const&) @@ -654,7 +654,7 @@ ff10 Allocator::moz_arena_memalign(unsigned long long, unsigned 3aef0 std::_Func_impl_no_alloc<`lambda at /builds/worker/workspace/obj-build/dist/include/mozilla/ProfileChunkedBuffer.h:1256:9',void,mozilla::UniquePtr > >::_Do_call(mozilla::UniquePtr >&&) 3af60 std::_Func_impl_no_alloc<`lambda at /builds/worker/workspace/obj-build/dist/include/mozilla/ProfileChunkedBuffer.h:1256:9',void,mozilla::UniquePtr > >::_Target_type() const 3af70 std::_Func_impl_no_alloc<`lambda at /builds/worker/workspace/obj-build/dist/include/mozilla/ProfileChunkedBuffer.h:1256:9',void,mozilla::UniquePtr > >::_Delete_this(bool) -3afb0 std::_Func_impl_no_alloc<`lambda at /builds/worker/checkouts/gecko/mozglue/baseprofiler/core/ProfileJSONWriter.cpp:76:37',char *,unsigned long long>::_Get() const +3afb0 std::_Func_impl_no_alloc<`lambda at /builds/worker/workspace/obj-build/dist/include/mozilla/ProfileChunkedBuffer.h:1256:9',void,mozilla::UniquePtr > >::_Get() const 3afc0 mozilla::ProfileChunkedBuffer::RequestedChunkRefCountedHolder::AddRequestedChunk(mozilla::UniquePtr >&&) 3b030 mozilla::ProfileBufferChunk::SetLast(mozilla::UniquePtr >&&) 3b080 mozilla::WriteULEB128(unsigned int, mozilla::ProfileBufferEntryWriter&)