Let's #[expect] some lints: Stabilize lint_reasons (RFC 2383) by xFrednet · Pull Request #120924 · rust-lang/rust (original) (raw)

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

Let's give this another try! The previous stabilization attempt was stalled by some unresolved questions. These have been discussed in a lang team meeting. The last open question, regarding the semantics of the #[expect] attribute was decided on in #115980

I've just updated the stabilization report with the discussed questions and decisions. Luckily, the decision is inline with the current implementation.

This hopefully covers everything. Let's hope that the CI will be green like the spring.

fixes #115980
fixes #54503

For the release note author:

There are two Clippy lints which could be noteworthy:

• clippy::allow_attributes to restrict allow attributes in favor of #[expect] or to migrate #[allow] attributes to #[expect]
• clippy::allow_attributes_without_reason To require a reason for #[allow] attributes

Both are allow-by-default lints in the restriction category.

r? @wesleywiser

Tacking Issue: #54503
Stabilization Report: #54503 (comment)
Documentation Update: rust-lang/reference#1237

Roses are red,
Violets are blue,
Let's expect lints,
With reason clues

PaulDance reacted with thumbs up emoji oli-obk, Centri3, y21, blyxyas, clubby789, slanterns, asquared31415, Kobzol, hasali19, mati865, and 30 more reacted with heart emoji JarredAllen, kennytm, Luracasmus, and AceofSpades5757 reacted with rocket emoji

rustbot added S-waiting-on-review

Status: Awaiting review from the assignee but also interested parties.

T-compiler

Relevant to the compiler team, which will review and decide on the PR/issue.

T-rustdoc

Relevant to the rustdoc team, which will review and decide on the PR/issue.

labels

Feb 11, 2024

Alright, looks like most of the CI already agrees with my changes, let's kick off the reviewing process.

r? @wesleywiser

xFrednet marked this pull request as ready for review

February 11, 2024 10:29

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

This comment was marked as off-topic.

This comment has been minimized.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modulo the bootstrap cfgs in ui tests, the compiler side lgtm

This comment has been minimized.

Implementation looks good to me! If I understand the current state correctly, T-lang has signed off on the previously unresolved questions but has not yet FCP'd stabilization. Is that correct?

I think the next step is then for us to start a stabilization FCP.

Implementation looks good to me! If I understand the current state correctly, T-lang has signed off on the previously unresolved questions but has not yet FCP'd stabilization. Is that correct?

Now that you say it, I believe this is correct. The previous stabilization report has been updated and should be sufficient. How do we kick off the FCP, do we ping T-lang in the tacking issue or here? #54503

And should I repost the updated stabilization report, just to have it at the bottom?

oli-obk added T-lang

Relevant to the language team, which will review and decide on the PR/issue.

I-lang-nominated

Nominated for discussion during a lang team meeting.

and removed T-rustdoc

Relevant to the rustdoc team, which will review and decide on the PR/issue.

T-compiler

Relevant to the compiler team, which will review and decide on the PR/issue.

labels

Feb 12, 2024

Let's go ahead and do the FCP here, just so it's in the same PR that will eventually be merged 🙂

@rust-lang/lang, now that the implementation questions regarding #[expect] have been resolved, we feel the feature is ready for stabilization. @xFrednet has updated the stabilization report to reflect the current state.

Let's go ahead and do the FCP here, just so it's in the same PR that will eventually be merged 🙂

@rust-lang/lang, now that the implementation questions regarding #[expect] have been resolved, we feel the feature is ready for stabilization. @xFrednet has updated the stabilization report to reflect the current state.

Let's do it!

@rfcbot merge

Team member @tmandry has proposed to merge this. The next step is review by the rest of the tagged team members:

• @joshtriplett
• @nikomatsakis
• @pnkfelix
• @scottmcm
• @tmandry

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

cc @rust-lang/lang-advisors: FCP proposed for lang, please feel free to register concerns.
See this document for info about what commands tagged team members can give me.

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jul 4, 2024

Rewrite lint_expectations in a single pass.

This PR aims at reducing the perf regression from rust-lang#120924 (comment) with drive-by simplifications.

Basically, instead of using the lint level builder, which is slow, this PR splits lint_expectations logic in 2:

• listing the LintExpectations is done in shallow_lint_levels_on, on a per-owner basis;
• building the unstable->stable expectation id map is done by iterating on attributes.

r? ghost for perf

bors added a commit to rust-lang-ci/rust that referenced this pull request

Sep 1, 2024

Rewrite lint_expectations in a single pass.

This PR aims at reducing the perf regression from rust-lang#120924 (comment) with drive-by simplifications.

Basically, instead of using the lint level builder, which is slow, this PR splits lint_expectations logic in 2:

• listing the LintExpectations is done in shallow_lint_levels_on, on a per-owner basis;
• building the unstable->stable expectation id map is done by iterating on attributes.

r? ghost for perf

github-actions bot pushed a commit to rust-lang/miri that referenced this pull request

Sep 2, 2024

Rewrite lint_expectations in a single pass.

This PR aims at reducing the perf regression from rust-lang/rust#120924 (comment) with drive-by simplifications.

Basically, instead of using the lint level builder, which is slow, this PR splits lint_expectations logic in 2:

• listing the LintExpectations is done in shallow_lint_levels_on, on a per-owner basis;
• building the unstable->stable expectation id map is done by iterating on attributes.

r? ghost for perf

As the (embarrassingly absent) RFC author, I am thrilled to see this land! Thank you all for your effort in actually taking my initial ideas and doing all the effort to refine, implement, and ship them. I can't wait to start using it.

Rudxain reacted with laugh emoji timvisee, MrCroxx, wesleywiser, slanterns, xFrednet, eopb, lffg, joseluis, cayman-amzn, flip1995, and 2 more reacted with heart emoji Rudxain reacted with rocket emoji

tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request

Sep 11, 2024

This MR contains the following updates:

MR created with the help of el-capitano/tools/renovate-bot.

Proposed changes to behavior should be submitted there as MRs.

Release Notes

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this MR and you won't be reminded about this update again.

• If you want to rebase/retry this MR, check this box

This MR has been generated by Renovate Bot.

wip-sync pushed a commit to NetBSD/pkgsrc-wip that referenced this pull request

Sep 22, 2024

Pkgsrc changes:

• Adapt patches, apply to new vendored crates where needed.
• Back-port rust pull request 130110, "make dist vendoring configurable"
• Disable "dist vendoring", otherwise cargo would try to access the network during the build phase.

Upstream changes:

Version 1.81.0 (2024-09-05)

Language

• [Abort on uncaught panics in extern "C" functions.] (rust-lang/rust#116088)
• [Fix ambiguous cases of multiple & in elided self lifetimes.] (rust-lang/rust#117967)
• [Stabilize #[expect] for lints (RFC 2383),] (rust-lang/rust#120924) like #[allow] with a warning if the lint is not fulfilled.
• [Change method resolution to constrain hidden types instead of rejecting method candidates.] (rust-lang/rust#123962)
• [Bump elided_lifetimes_in_associated_constant to deny.] (rust-lang/rust#124211)
• [offset_from: always allow pointers to point to the same address.] (rust-lang/rust#124921)
• [Allow constraining opaque types during subtyping in the trait system.] (rust-lang/rust#125447)
• [Allow constraining opaque types during various unsizing casts.] (rust-lang/rust#125610)
• [Deny keyword lifetimes pre-expansion.] (rust-lang/rust#126762)

Compiler

• [Make casts of pointers to trait objects stricter.] (rust-lang/rust#120248)
• [Check alias args for well-formedness even if they have escaping bound vars.] (rust-lang/rust#123737)
• [Deprecate no-op codegen option -Cinline-threshold=....] (rust-lang/rust#124712)
• [Re-implement a type-size based limit.] (rust-lang/rust#125507)
• [Properly account for alignment in transmute size checks.] (rust-lang/rust#125740)
• [Remove the box_pointers lint.] (rust-lang/rust#126018)
• [Ensure the interpreter checks bool/char for validity when they are used in a cast.] (rust-lang/rust#126265)
• [Improve coverage instrumentation for functions containing nested items.] (rust-lang/rust#127199)
• Target changes:
  • [Add Tier 3 no_std Xtensa targets:] (rust-lang/rust#125141) xtensa-esp32-none-elf, xtensa-esp32s2-none-elf, xtensa-esp32s3-none-elf
  • [Add Tier 3 std Xtensa targets:] (rust-lang/rust#126380) xtensa-esp32-espidf, xtensa-esp32s2-espidf, xtensa-esp32s3-espidf
  • [Add Tier 3 i686 Redox OS target:] (rust-lang/rust#126192) i686-unknown-redox
  • [Promote arm64ec-pc-windows-msvc to Tier 2.] (rust-lang/rust#126039)
  • [Promote wasm32-wasip2 to Tier 2.] (rust-lang/rust#126967)
  • [Promote loongarch64-unknown-linux-musl to Tier 2 with host tools.] (rust-lang/rust#126298)
  • [Enable full tools and profiler for LoongArch Linux targets.] (rust-lang/rust#127078)
  • [Unconditionally warn on usage of wasm32-wasi.] (rust-lang/rust#126662) (see compatibility note below)
  • Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support.

Libraries

• [Split core's PanicInfo and std's PanicInfo.] (rust-lang/rust#115974) (see compatibility note below)
• [Generalize {Rc,Arc}::make_mut() to unsized types.] (rust-lang/rust#116113)
• [Replace sort implementations with stable driftsort and unstable ipnsort.] (rust-lang/rust#124032) All slice::sort* and slice::select_nth* methods are expected to see significant performance improvements. See the [research project] (https://github.com/Voultapher/sort-research-rs) for more details.
• [Document behavior of create_dir_all with respect to empty paths.] (rust-lang/rust#125112)
• [Fix interleaved output in the default panic hook when multiple threads panic simultaneously.] (rust-lang/rust#127397)
• Fix Command's batch files argument escaping not working when file name has trailing whitespace or periods (CVE-2024-43402).

Stabilized APIs

• [core::error] (https://doc.rust-lang.org/stable/core/error/index.html)
• [hint::assert_unchecked] (https://doc.rust-lang.org/stable/core/hint/fn.assert_unchecked.html)
• [fs::exists] (https://doc.rust-lang.org/stable/std/fs/fn.exists.html)
• [AtomicBool::fetch_not] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicBool.html#method.fetch_not)
• [Duration::abs_diff] (https://doc.rust-lang.org/stable/core/time/struct.Duration.html#method.abs_diff)
• [IoSlice::advance] (https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.advance)
• [IoSlice::advance_slices] (https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.advance_slices)
• [IoSliceMut::advance] (https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.advance)
• [IoSliceMut::advance_slices] (https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.advance_slices)
• [PanicHookInfo] (https://doc.rust-lang.org/stable/std/panic/struct.PanicHookInfo.html)
• [PanicInfo::message] (https://doc.rust-lang.org/stable/core/panic/struct.PanicInfo.html#method.message)
• [PanicMessage] (https://doc.rust-lang.org/stable/core/panic/struct.PanicMessage.html)

These APIs are now stable in const contexts:

• [char::from_u32_unchecked] (https://doc.rust-lang.org/stable/core/char/fn.from_u32_unchecked.html) (function)
• [char::from_u32_unchecked] (https://doc.rust-lang.org/stable/core/primitive.char.html#method.from_u32_unchecked) (method)
• [CStr::count_bytes] (https://doc.rust-lang.org/stable/core/ffi/c_str/struct.CStr.html#method.count_bytes)
• [CStr::from_ptr] (https://doc.rust-lang.org/stable/core/ffi/c_str/struct.CStr.html#method.from_ptr)

Cargo

• [Generated .cargo_vcs_info.json is always included, even when --allow-dirty is passed.] (rust-lang/cargo#13960)
• [Disallow package.license-file and package.readme pointing to non-existent files during packaging.] (rust-lang/cargo#13921)
• [Disallow passing --release/--debug flag along with the --profile flag.] (rust-lang/cargo#13971)
• [Remove lib.plugin key support in Cargo.toml. Rust plugin support has been deprecated for four years and was removed in 1.75.0.] (rust-lang/cargo#13902)

Compatibility Notes

• Usage of the wasm32-wasi target will now issue a compiler warning and request users switch to the wasm32-wasip1 target instead. Both targets are the same, wasm32-wasi is only being renamed, and this [change to the WASI target] (https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html) is being done to enable removing wasm32-wasi in January 2025.

• We have renamed std::panic::PanicInfo to std::panic::PanicHookInfo. The old name will continue to work as an alias, but will result in a deprecation warning starting in Rust 1.82.0.

  core::panic::PanicInfo will remain unchanged, however, as this is now a different type.

  The reason is that these types have different roles: std::panic::PanicHookInfo is the argument to the panic hook in std context (where panics can have an arbitrary payload), while core::panic::PanicInfo is the argument to the #[panic_handler] in no_std context (where panics always carry a formatted message). Separating these types allows us to add more useful methods to these types, such as std::panic::PanicHookInfo::payload_as_str() and core::panic::PanicInfo::message().

• The new sort implementations may panic if a type's implementation of Ord (or the given comparison function) does not implement a total order as the trait requires. Ord's supertraits (PartialOrd, Eq, and PartialEq) must also be consistent. The previous implementations would not "notice" any problem, but the new implementations have a good chance of detecting inconsistencies, throwing a panic rather than returning knowingly unsorted data.

• [In very rare cases, a change in the internal evaluation order of the trait solver may result in new fatal overflow errors.] (rust-lang/rust#126128)

Internal Changes

These changes do not affect any public interfaces of Rust, but they represent significant improvements to the performance or internals of rustc and related tools.

• [Add a Rust-for Linux auto CI job to check kernel builds.] (rust-lang/rust#125209)

lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request

Sep 25, 2024

Rewrite lint_expectations in a single pass.

This PR aims at reducing the perf regression from rust-lang/rust#120924 (comment) with drive-by simplifications.

Basically, instead of using the lint level builder, which is slow, this PR splits lint_expectations logic in 2:

• listing the LintExpectations is done in shallow_lint_levels_on, on a per-owner basis;
• building the unstable->stable expectation id map is done by iterating on attributes.

r? ghost for perf

zaneduffield added a commit to integrated-application-development/pasfmt that referenced this pull request

Sep 30, 2024

zaneduffield added a commit to integrated-application-development/pasfmt that referenced this pull request

Oct 2, 2024

facebook-github-bot pushed a commit to facebookexperimental/rust-shed that referenced this pull request

Oct 7, 2024

facebook-github-bot pushed a commit to facebookincubator/buck2-change-detector that referenced this pull request

Oct 7, 2024

facebook-github-bot pushed a commit to facebookexperimental/allocative that referenced this pull request

Oct 7, 2024

ojeda mentioned this pull request

Nov 18, 2024

95 tasks

netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request

Nov 24, 2024

Pkgsrc changes:

• Adapt patches, apply to new vendored crates where needed.
• Back-port rust pull request 130110, "make dist vendoring configurable"
• Disable "dist vendoring", otherwise cargo would try to access the network during the build phase.

Upstream changes:

Version 1.81.0 (2024-09-05)

Language

• [Abort on uncaught panics in extern "C" functions.] (rust-lang/rust#116088)
• [Fix ambiguous cases of multiple & in elided self lifetimes.] (rust-lang/rust#117967)
• [Stabilize #[expect] for lints (RFC 2383),] (rust-lang/rust#120924) like #[allow] with a warning if the lint is not fulfilled.
• [Change method resolution to constrain hidden types instead of rejecting method candidates.] (rust-lang/rust#123962)
• [Bump elided_lifetimes_in_associated_constant to deny.] (rust-lang/rust#124211)
• [offset_from: always allow pointers to point to the same address.] (rust-lang/rust#124921)
• [Allow constraining opaque types during subtyping in the trait system.] (rust-lang/rust#125447)
• [Allow constraining opaque types during various unsizing casts.] (rust-lang/rust#125610)
• [Deny keyword lifetimes pre-expansion.] (rust-lang/rust#126762)

Compiler

• [Make casts of pointers to trait objects stricter.] (rust-lang/rust#120248)
• [Check alias args for well-formedness even if they have escaping bound vars.] (rust-lang/rust#123737)
• [Deprecate no-op codegen option -Cinline-threshold=....] (rust-lang/rust#124712)
• [Re-implement a type-size based limit.] (rust-lang/rust#125507)
• [Properly account for alignment in transmute size checks.] (rust-lang/rust#125740)
• [Remove the box_pointers lint.] (rust-lang/rust#126018)
• [Ensure the interpreter checks bool/char for validity when they are used in a cast.] (rust-lang/rust#126265)
• [Improve coverage instrumentation for functions containing nested items.] (rust-lang/rust#127199)
• Target changes:
  • [Add Tier 3 no_std Xtensa targets:] (rust-lang/rust#125141) xtensa-esp32-none-elf, xtensa-esp32s2-none-elf, xtensa-esp32s3-none-elf
  • [Add Tier 3 std Xtensa targets:] (rust-lang/rust#126380) xtensa-esp32-espidf, xtensa-esp32s2-espidf, xtensa-esp32s3-espidf
  • [Add Tier 3 i686 Redox OS target:] (rust-lang/rust#126192) i686-unknown-redox
  • [Promote arm64ec-pc-windows-msvc to Tier 2.] (rust-lang/rust#126039)
  • [Promote wasm32-wasip2 to Tier 2.] (rust-lang/rust#126967)
  • [Promote loongarch64-unknown-linux-musl to Tier 2 with host tools.] (rust-lang/rust#126298)
  • [Enable full tools and profiler for LoongArch Linux targets.] (rust-lang/rust#127078)
  • [Unconditionally warn on usage of wasm32-wasi.] (rust-lang/rust#126662) (see compatibility note below)
  • Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support.

Libraries

• [Split core's PanicInfo and std's PanicInfo.] (rust-lang/rust#115974) (see compatibility note below)
• [Generalize {Rc,Arc}::make_mut() to unsized types.] (rust-lang/rust#116113)
• [Replace sort implementations with stable driftsort and unstable ipnsort.] (rust-lang/rust#124032) All slice::sort* and slice::select_nth* methods are expected to see significant performance improvements. See the [research project] (https://github.com/Voultapher/sort-research-rs) for more details.
• [Document behavior of create_dir_all with respect to empty paths.] (rust-lang/rust#125112)
• [Fix interleaved output in the default panic hook when multiple threads panic simultaneously.] (rust-lang/rust#127397)
• Fix Command's batch files argument escaping not working when file name has trailing whitespace or periods (CVE-2024-43402).

Stabilized APIs

• [core::error] (https://doc.rust-lang.org/stable/core/error/index.html)
• [hint::assert_unchecked] (https://doc.rust-lang.org/stable/core/hint/fn.assert_unchecked.html)
• [fs::exists] (https://doc.rust-lang.org/stable/std/fs/fn.exists.html)
• [AtomicBool::fetch_not] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicBool.html#method.fetch_not)
• [Duration::abs_diff] (https://doc.rust-lang.org/stable/core/time/struct.Duration.html#method.abs_diff)
• [IoSlice::advance] (https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.advance)
• [IoSlice::advance_slices] (https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.advance_slices)
• [IoSliceMut::advance] (https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.advance)
• [IoSliceMut::advance_slices] (https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.advance_slices)
• [PanicHookInfo] (https://doc.rust-lang.org/stable/std/panic/struct.PanicHookInfo.html)
• [PanicInfo::message] (https://doc.rust-lang.org/stable/core/panic/struct.PanicInfo.html#method.message)
• [PanicMessage] (https://doc.rust-lang.org/stable/core/panic/struct.PanicMessage.html)

These APIs are now stable in const contexts:

• [char::from_u32_unchecked] (https://doc.rust-lang.org/stable/core/char/fn.from_u32_unchecked.html) (function)
• [char::from_u32_unchecked] (https://doc.rust-lang.org/stable/core/primitive.char.html#method.from_u32_unchecked) (method)
• [CStr::count_bytes] (https://doc.rust-lang.org/stable/core/ffi/c_str/struct.CStr.html#method.count_bytes)
• [CStr::from_ptr] (https://doc.rust-lang.org/stable/core/ffi/c_str/struct.CStr.html#method.from_ptr)

Cargo

• [Generated .cargo_vcs_info.json is always included, even when --allow-dirty is passed.] (rust-lang/cargo#13960)
• [Disallow package.license-file and package.readme pointing to non-existent files during packaging.] (rust-lang/cargo#13921)
• [Disallow passing --release/--debug flag along with the --profile flag.] (rust-lang/cargo#13971)
• [Remove lib.plugin key support in Cargo.toml. Rust plugin support has been deprecated for four years and was removed in 1.75.0.] (rust-lang/cargo#13902)

Compatibility Notes

• Usage of the wasm32-wasi target will now issue a compiler warning and request users switch to the wasm32-wasip1 target instead. Both targets are the same, wasm32-wasi is only being renamed, and this [change to the WASI target] (https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html) is being done to enable removing wasm32-wasi in January 2025.

• We have renamed std::panic::PanicInfo to std::panic::PanicHookInfo. The old name will continue to work as an alias, but will result in a deprecation warning starting in Rust 1.82.0.

  core::panic::PanicInfo will remain unchanged, however, as this is now a different type.

  The reason is that these types have different roles: std::panic::PanicHookInfo is the argument to the panic hook in std context (where panics can have an arbitrary payload), while core::panic::PanicInfo is the argument to the #[panic_handler] in no_std context (where panics always carry a formatted message). Separating these types allows us to add more useful methods to these types, such as std::panic::PanicHookInfo::payload_as_str() and core::panic::PanicInfo::message().

• The new sort implementations may panic if a type's implementation of Ord (or the given comparison function) does not implement a total order as the trait requires. Ord's supertraits (PartialOrd, Eq, and PartialEq) must also be consistent. The previous implementations would not "notice" any problem, but the new implementations have a good chance of detecting inconsistencies, throwing a panic rather than returning knowingly unsorted data.

• [In very rare cases, a change in the internal evaluation order of the trait solver may result in new fatal overflow errors.] (rust-lang/rust#126128)

Internal Changes

These changes do not affect any public interfaces of Rust, but they represent significant improvements to the performance or internals of rustc and related tools.

• [Add a Rust-for Linux auto CI job to check kernel builds.] (rust-lang/rust#125209)

Reviewers

oli-obk oli-obk approved these changes

Urgau Urgau approved these changes

iamahuman iamahuman left review comments

qarmin qarmin left review comments

Centri3 Centri3 left review comments

wesleywiser wesleywiser approved these changes

blyxyas blyxyas approved these changes