Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
matrix:
rust:
- stable
- 1.63.0 # MSRV for linux distributions (>= Debian 12)
# - nightly # To keep the MSRV, we can't test with nightly as some downgraded crates fails to compile
- 1.75.0 # MSRV for linux distributions (>= Debian 12)
- nightly
platform: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.platform }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Muhammad Mominul Huque <mominul2082@gmail.com>"]
license = "MPL-2.0"
edition = "2021"
rust-version = "1.63.0"
rust-version = "1.75.0"

[lib]
crate-type = ["lib", "staticlib"]
Expand All @@ -19,10 +19,10 @@ codegen-units = 1
ahash = { version = "0.8", features = ["serde"] }
emojicon = { version = "0.5", features = ["custom"] }
serde_json = "1.0"
regex = "~1.9" # For maintaining MSRV
regex = "1.9"
stringplus = "0.1"
edit-distance = "2.1"
okkhor = "0.7"
okkhor = "0.8"
poriborton = "0.2"
upodesh = "0.4"

Expand Down
17 changes: 9 additions & 8 deletions riti.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// !$*UTF8*$!
{
/* generated with cargo-xcode 1.11.0 */
archiveVersion = 1;
classes = {
};
Expand Down Expand Up @@ -32,7 +31,7 @@

/* Begin PBXFileReference section */
CA00B9937C4654FCDE10A9EB /* libriti.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libriti.a; sourceTree = BUILT_PRODUCTS_DIR; };
CAF95239D67F3EF4668187A5 /* Cargo.toml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cargo.toml; path = Cargo.toml; sourceTree = "<group>"; };
CAF95239D67F3EF4668187A5 /* Cargo.toml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cargo.toml; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -124,41 +123,43 @@
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
CA00A0F7F57D1056C3DE07A2 /* Release */ = {
CA004EBF41001056C3DE07A2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CARGO_XCODE_CARGO_DEP_FILE_NAME = libriti.d;
CARGO_XCODE_CARGO_FILE_NAME = libriti.a;
INSTALL_GROUP = "";
INSTALL_MODE_FLAG = "";
INSTALL_OWNER = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_NAME = riti;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos";
};
name = Release;
name = Debug;
};
CA004EBF41001056C3DE07A2 /* Debug */ = {
CA00A0F7F57D1056C3DE07A2 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CARGO_XCODE_CARGO_DEP_FILE_NAME = libriti.d;
CARGO_XCODE_CARGO_FILE_NAME = libriti.a;
INSTALL_GROUP = "";
INSTALL_MODE_FLAG = "";
INSTALL_OWNER = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_NAME = riti;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos";
};
name = Debug;
name = Release;
};
CAF7FE07D4CF3CC16B37690B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
"ADDITIONAL_SDKS[sdk=a*]" = macosx;
"ADDITIONAL_SDKS[sdk=i*]" = macosx;
"ADDITIONAL_SDKS[sdk=w*]" = macosx;
"ADDITIONAL_SDKS[sdk=x*]" = macosx;
"ADDITIONAL_SDKS[sdk=a*]" = macosx;
ALWAYS_SEARCH_USER_PATHS = NO;
CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target";
CARGO_XCODE_BUILD_PROFILE = release;
Expand All @@ -176,10 +177,10 @@
CAF8FE07D4CF228BE02872F8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"ADDITIONAL_SDKS[sdk=a*]" = macosx;
"ADDITIONAL_SDKS[sdk=i*]" = macosx;
"ADDITIONAL_SDKS[sdk=w*]" = macosx;
"ADDITIONAL_SDKS[sdk=x*]" = macosx;
"ADDITIONAL_SDKS[sdk=a*]" = macosx;
ALWAYS_SEARCH_USER_PATHS = NO;
CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target";
CARGO_XCODE_BUILD_PROFILE = debug;
Expand Down
8 changes: 6 additions & 2 deletions src/fixed/method.rs
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ fn is_left_standing_kar(c: char) -> bool {
}

#[cfg(test)]
#[allow(unused_imports)]
mod tests {
use pretty_assertions::assert_eq;

Expand Down Expand Up @@ -622,6 +623,9 @@ mod tests {
assert_eq!(method.suggestions, ["()"]);
}

// The latest Rust version has incompatibility with the sorting order of the suggestions.
// So, this sensitive test are disabled for the MSRV.
#[rustversion::not(stable(1.75))]
#[test]
fn test_suggestion_smart_quote() {
let mut method = FixedMethod::default();
Expand All @@ -645,7 +649,7 @@ mod tests {

// The latest Rust version has incompatibility with the sorting order of the suggestions.
// So, this sensitive test are disabled for the MSRV.
#[rustversion::not(stable(1.63))]
#[rustversion::not(stable(1.75))]
#[test]
fn test_emojis() {
use crate::keycodes::VC_SEMICOLON; // Don't know why Rust 1.63 errors on unused import in CI.
Expand Down Expand Up @@ -697,7 +701,7 @@ mod tests {

// The latest Rust version has incompatibility with the sorting order of the suggestions.
// So, this sensitive test are disabled for the MSRV.
#[rustversion::not(stable(1.63))]
#[rustversion::not(stable(1.75))]
#[test]
fn test_suggestion_ansi() {
let mut method = FixedMethod::default();
Expand Down