From nobody Sun Apr 14 20:41:45 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VHhzt01pMz5H2gp; Sun, 14 Apr 2024 20:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VHhzs44wNz4rGJ; Sun, 14 Apr 2024 20:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713127305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2j6V66fYWa18+NLyKDnjJyEdbiWEUce7ssBFQLS49M=; b=iDox+ADN2vl692lMHrRSmjgHELZ4nUI5KVTdWK4raTnBruDVv7IDbPIwAMFgz5moYv7uAr uaS8AfbaeQmckCUbZp+CNW10XInCRN5A3CRYfbpTzTyNjCufSacHUBWgLK7F3fp3utyN/6 Cvz+hOUyhujltR8o3J5F3RbW14ynTuXVZHHnMNZzRy2Z4BUPbTv+DPn4au52nFNqIqz/jG Qc550fBOwqwaOORqLwzvfVaOsRJOcGYabjJYohz3PMQ+xlVcLC0f4hCiny9N2X/0fh6/HY kA+ZO+EoHXo5x7RY9mvjJi2q9c3V2TUXK6iyHXgtcZ1oo/bFm8almO0imyh9LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713127305; a=rsa-sha256; cv=none; b=DfFTA/I02tWrWZ9atlSrtmh1ByCrpFlt82yWJqlfODoHR/uOfb0+rQZphBtEN+9awHrYMc bIuymowtlWMDuAFoOoY7vuCDKeKZKaw36l7tZcegC509eLD8GobdQKYolkOHTJb+ohIQRM poRsnT2DsUvfy1CBcJXJHV+T88JY94e6r7JjyY/1eBv+nhhDidElyFed62oOFpPcalh8BT Me11pueFLnmoyoVRT2+6FeJhLDMh12QZfuAqscR914h2l815tUt5lrIQnuKO5seFfA6ThS C0jEpAdfOFyPypbkpHunTvUjlUgdsgYZGc+1AVPn3D/4rl9sAThAGdQfZlYsvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713127305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2j6V66fYWa18+NLyKDnjJyEdbiWEUce7ssBFQLS49M=; b=uK/NE53FqUFPR9l/wxQW0YLa2Q5mrhXK72LDBm2FDA7cWSOPGBH2OVvzDaVU5CjvfzgVHR n4N34cxTO8m6znuxglcj3WlzixBmrvL9QKiU10SQXRfegT6n7RrY8Zyvpycy4rp8D+dSLS 1+J9lxcPIIqjBT5cNMQoo6Qa7Gs9j/obVW7plPNn4zgQXSwiaZXaiEdylvpz5/wIrZsfY7 c5HxBpt70Ad7DfSTJCMBHkC6dvl32my7NrL8BCPhlyPVdGV1NSqVG8SfTUPhKasf07fVji cy77T2Dy1HGdUce32Lmp4SZoRnS5ptqIERCBBs2yHHPnP/jFpwN26tUhW9JDWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VHhzs3hZbzWcx; Sun, 14 Apr 2024 20:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43EKfjiC008317; Sun, 14 Apr 2024 20:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43EKfjaS008314; Sun, 14 Apr 2024 20:41:45 GMT (envelope-from git) Date: Sun, 14 Apr 2024 20:41:45 GMT Message-Id: <202404142041.43EKfjaS008314@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 23db6a602c3d - 2024Q2 - www/firefox-esr: fix rust warnings "variable does not need to be mutable" List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 23db6a602c3dd30dfe594f20b40bcbd035d735cb Auto-Submitted: auto-generated The branch 2024Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=23db6a602c3dd30dfe594f20b40bcbd035d735cb commit 23db6a602c3dd30dfe594f20b40bcbd035d735cb Author: Christoph Moench-Tegeder AuthorDate: 2024-04-14 20:39:36 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-04-14 20:41:32 +0000 www/firefox-esr: fix rust warnings "variable does not need to be mutable" This led to build failure in thunderbird on some toolchains, I'd expect the same here, so fix it. https://bugzilla.mozilla.org/show_bug.cgi?id=1841919 (cherry picked from commit ea1caa7f0b66163c6144b7a91b7c78a23280dcf9) --- www/firefox-esr/files/patch-bug1841919 | 75 ++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/www/firefox-esr/files/patch-bug1841919 b/www/firefox-esr/files/patch-bug1841919 new file mode 100644 index 000000000000..93bd00f462ae --- /dev/null +++ b/www/firefox-esr/files/patch-bug1841919 @@ -0,0 +1,75 @@ +commit 54ebf78999815570c3cd4d94bf00daa7dec6061d +Author: Mike Hommey +Date: Thu Jul 6 02:34:07 2023 +0000 + + Bug 1841919 - Fix "variable does not need to be mutable" warnings in webrender. r=gfx-reviewers,lsalzman + + Differential Revision: https://phabricator.services.mozilla.com/D182851 + +diff --git gfx/wr/webrender/src/compositor/sw_compositor.rs gfx/wr/webrender/src/compositor/sw_compositor.rs +index e623870c86f3..854fef6fe2b9 100644 +--- gfx/wr/webrender/src/compositor/sw_compositor.rs ++++ gfx/wr/webrender/src/compositor/sw_compositor.rs +@@ -1026,7 +1026,7 @@ impl SwCompositor { + if let Some(surface) = self.surfaces.get_mut(id) { + if let Some(external_image) = surface.external_image { + assert!(!surface.tiles.is_empty()); +- let mut tile = &mut surface.tiles[0]; ++ let tile = &mut surface.tiles[0]; + if let Some(info) = self.composite_surfaces.get(&external_image) { + tile.valid_rect = DeviceIntRect::from_size(info.size); + return; +diff --git gfx/wr/webrender/src/picture.rs gfx/wr/webrender/src/picture.rs +index bd685d48a113..72c0e1efa038 100644 +--- gfx/wr/webrender/src/picture.rs ++++ gfx/wr/webrender/src/picture.rs +@@ -2888,7 +2888,7 @@ impl TileCacheInstance { + let prim_clip_chain = &prim_instance.vis.clip_chain; + + // Accumulate the exact (clipped) local rect in to the parent surface +- let mut surface = &mut surfaces[prim_surface_index.0]; ++ let surface = &mut surfaces[prim_surface_index.0]; + surface.clipped_local_rect = surface.clipped_local_rect.union(&prim_clip_chain.pic_coverage_rect); + + // If the primitive is directly drawn onto this picture cache surface, then +diff --git gfx/wr/webrender_api/src/display_item_cache.rs gfx/wr/webrender_api/src/display_item_cache.rs +index 6cd1eb3e3a44..60d41c591d36 100644 +--- gfx/wr/webrender_api/src/display_item_cache.rs ++++ gfx/wr/webrender_api/src/display_item_cache.rs +@@ -58,13 +58,13 @@ pub struct DisplayItemCache { + + impl DisplayItemCache { + fn add_item(&mut self, key: ItemKey, item: CachedDisplayItem) { +- let mut entry = &mut self.entries[key as usize]; ++ let entry = &mut self.entries[key as usize]; + entry.items.push(item); + entry.occupied = true; + } + + fn clear_entry(&mut self, key: ItemKey) { +- let mut entry = &mut self.entries[key as usize]; ++ let entry = &mut self.entries[key as usize]; + entry.items.clear(); + entry.occupied = false; + } +commit 8300555a01bdcc478ae103dcf2b469bf24e4dd41 +Author: Mike Hommey +Date: Thu Jul 6 04:26:41 2023 +0000 + + Bug 1841919 - Fix "variable does not need to be mutable" warning in wrench. r=gfx-reviewers,jrmuizel + + Differential Revision: https://phabricator.services.mozilla.com/D182858 + +diff --git gfx/wr/wrench/src/reftest.rs gfx/wr/wrench/src/reftest.rs +index 136a4477205d..0e900224b883 100644 +--- gfx/wr/wrench/src/reftest.rs ++++ gfx/wr/wrench/src/reftest.rs +@@ -514,7 +514,7 @@ impl ReftestManifest { + max_difference: options.allow_max_difference, + num_differences: options.allow_num_differences }), + 1 => { +- let mut fuzzy = &mut fuzziness[0]; ++ let fuzzy = &mut fuzziness[0]; + fuzzy.max_difference = cmp::max(fuzzy.max_difference, options.allow_max_difference); + fuzzy.num_differences = cmp::max(fuzzy.num_differences, options.allow_num_differences); + },