Remove magic constants when using base_n.
#123922
Merged
Conversation
This file contains 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
|
r? @davidtwco rustbot has assigned @davidtwco. Use |
rustbot
added
S-waiting-on-review
|
Thanks for the cleanup! |
bors
added
S-waiting-on-bors
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Apr 15, 2024
…ieyouxu Remove magic constants when using `base_n`. Some use cases of `base_n` use number literals instead of the predefined constants. The latter are more descriptive so it might be better to use those instead.
This was referenced Apr 15, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 15, 2024
Rollup of 12 pull requests Successful merges: - rust-lang#123423 (Distribute LLVM bitcode linker as a preview component) - rust-lang#123548 (libtest: also measure time in Miri) - rust-lang#123666 (Fix some typos in doc) - rust-lang#123864 (Remove a HACK by instead inferring opaque types during expected/formal type checking) - rust-lang#123896 (Migrate some diagnostics in `rustc_resolve` to session diagnostic) - rust-lang#123919 (builtin-derive: tag → discriminant) - rust-lang#123922 (Remove magic constants when using `base_n`.) - rust-lang#123931 (Don't leak unnameable types in `-> _` recover) - rust-lang#123933 (move the LargeAssignments lint logic into its own file) - rust-lang#123934 (`rustc_data_structures::graph` mini refactor) - rust-lang#123941 (Fix UB in LLVM FFI when passing zero or >1 bundle) - rust-lang#123957 (disable create_dir_all_bare test on all(miri, windows)) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 15, 2024
Rollup merge of rust-lang#123922 - TDecking:base_n_magic_removal, r=jieyouxu Remove magic constants when using `base_n`. Some use cases of `base_n` use number literals instead of the predefined constants. The latter are more descriptive so it might be better to use those instead.
saethlin
reviewed
Apr 15, 2024
Comment on lines
832
to
+834
| pub(crate) fn push_integer_62(x: u64, output: &mut String) { | ||
| if let Some(x) = x.checked_sub(1) { | ||
| base_n::push_str(x as u128, 62, output); | ||
| base_n::push_str(x as u128, base_n::ALPHANUMERIC_ONLY, output); |
There was a problem hiding this comment.
62 is not a magic number here, its purpose is very clear from the name and documentation on this function. The constant is less clear. I'm going to revert the use of the constant when I fix the merge conflicts with #123441
Noratrieb
reviewed
Apr 16, 2024
| @@ -746,7 +746,7 @@ fn to_disambiguator(num: u64) -> String { | |||
| /// <https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangle.seq-id>). | |||
| fn to_seq_id(num: usize) -> String { | |||
| if let Some(num) = num.checked_sub(1) { | |||
| base_n::encode(num as u128, 36).to_uppercase() | |||
| base_n::encode(num as u128, base_n::CASE_INSENSITIVE).to_uppercase() | |||
There was a problem hiding this comment.
the link right above says
A <seq-id> is a sequence number in base 36,
so i'm not convinced that this is an improvement either. but whatever, it's fine
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some use cases of
base_nuse number literals instead of the predefined constants. The latter are more descriptive so it might be better to use those instead.