Skip to content

repair Ord for UseSegment #6375

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

Merged
merged 4 commits into from
Nov 4, 2024
Merged

repair Ord for UseSegment #6375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a27ed33
repair Ord for UseSegment
ajewellamz Oct 24, 2024
c07bb25
add test
ajewellamz Nov 2, 2024
7dac153
add edition comment and 2024 test
ajewellamz Nov 3, 2024
b146c63
update test cases to use the exact test case from the original issue
ytmimi Nov 4, 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
4 changes: 2 additions & 2 deletions src/imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,10 +943,10 @@ impl Ord for UseSegment {
version_sort(ia, ib)
} else {
// snake_case < CamelCase < UPPER_SNAKE_CASE
if ia.starts_with(char::is_uppercase) && ib.starts_with(char::is_lowercase) {
if ia.starts_with(char::is_uppercase) && !ib.starts_with(char::is_uppercase) {
return Ordering::Greater;
}
if ia.starts_with(char::is_lowercase) && ib.starts_with(char::is_uppercase) {
if !ia.starts_with(char::is_uppercase) && ib.starts_with(char::is_uppercase) {
return Ordering::Less;
}
if is_upper_snake_case(ia) && !is_upper_snake_case(ib) {
Expand Down
24 changes: 24 additions & 0 deletions tests/source/issue-6333.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// rustfmt-edition: 2021
// rustfmt-max_width: 125
pub use ::dafny_runtime::Sequence;
pub use ::std::rc::Rc;
pub use crate::r#_StructuredEncryptionUtil_Compile::CanonCryptoItem;
pub use ::dafny_runtime::itertools::Itertools;
pub use crate::software::amazon::cryptography::dbencryptionsdk::structuredencryption::internaldafny::types::CryptoAction;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::EncryptedDataKey;
pub use ::dafny_runtime::Object;
pub use crate::software::amazon::cryptography::primitives::internaldafny::types::IAwsCryptographicPrimitivesClient;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::AlgorithmSuiteInfo;
pub use ::dafny_runtime::DafnyCharUTF16;
pub use crate::r#_StructuredEncryptionUtil_Compile::MessageID;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::EncryptionMaterials;
pub use crate::r#_Wrappers_Compile::Outcome;
pub use ::dafny_runtime::string_utf16_of;
pub use ::dafny_runtime::int;
pub use ::dafny_runtime::MapBuilder;
pub use ::dafny_runtime::_System::nat;
pub use crate::software::amazon::cryptography::primitives::internaldafny::types::HMacInput;
pub use ::dafny_runtime::rd;
pub use ::dafny_runtime::truncate;
pub use ::dafny_runtime::DafnyTypeEq;
pub use ::dafny_runtime::DafnyType;
24 changes: 24 additions & 0 deletions tests/target/issue-6333-2024.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// rustfmt-edition: 2024
// rustfmt-max_width: 125
pub use crate::r#_StructuredEncryptionUtil_Compile::CanonCryptoItem;
pub use crate::r#_StructuredEncryptionUtil_Compile::MessageID;
pub use crate::r#_Wrappers_Compile::Outcome;
pub use crate::software::amazon::cryptography::dbencryptionsdk::structuredencryption::internaldafny::types::CryptoAction;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::AlgorithmSuiteInfo;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::EncryptedDataKey;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::EncryptionMaterials;
pub use crate::software::amazon::cryptography::primitives::internaldafny::types::HMacInput;
pub use crate::software::amazon::cryptography::primitives::internaldafny::types::IAwsCryptographicPrimitivesClient;
pub use ::dafny_runtime::_System::nat;
pub use ::dafny_runtime::DafnyCharUTF16;
pub use ::dafny_runtime::DafnyType;
pub use ::dafny_runtime::DafnyTypeEq;
pub use ::dafny_runtime::MapBuilder;
pub use ::dafny_runtime::Object;
pub use ::dafny_runtime::Sequence;
pub use ::dafny_runtime::int;
pub use ::dafny_runtime::itertools::Itertools;
pub use ::dafny_runtime::rd;
pub use ::dafny_runtime::string_utf16_of;
pub use ::dafny_runtime::truncate;
pub use ::std::rc::Rc;
24 changes: 24 additions & 0 deletions tests/target/issue-6333.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// rustfmt-edition: 2021
// rustfmt-max_width: 125
pub use crate::r#_StructuredEncryptionUtil_Compile::CanonCryptoItem;
pub use crate::r#_StructuredEncryptionUtil_Compile::MessageID;
pub use crate::r#_Wrappers_Compile::Outcome;
pub use crate::software::amazon::cryptography::dbencryptionsdk::structuredencryption::internaldafny::types::CryptoAction;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::AlgorithmSuiteInfo;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::EncryptedDataKey;
pub use crate::software::amazon::cryptography::materialproviders::internaldafny::types::EncryptionMaterials;
pub use crate::software::amazon::cryptography::primitives::internaldafny::types::HMacInput;
pub use crate::software::amazon::cryptography::primitives::internaldafny::types::IAwsCryptographicPrimitivesClient;
pub use ::dafny_runtime::_System::nat;
pub use ::dafny_runtime::int;
pub use ::dafny_runtime::itertools::Itertools;
pub use ::dafny_runtime::rd;
pub use ::dafny_runtime::string_utf16_of;
pub use ::dafny_runtime::truncate;
pub use ::dafny_runtime::DafnyCharUTF16;
pub use ::dafny_runtime::DafnyType;
pub use ::dafny_runtime::DafnyTypeEq;
pub use ::dafny_runtime::MapBuilder;
pub use ::dafny_runtime::Object;
pub use ::dafny_runtime::Sequence;
pub use ::std::rc::Rc;
Loading