Skip to content

Commit

Permalink
Merge pull request #786 from ridwanabdillahi/fix_build_break
Browse files Browse the repository at this point in the history
Update the minimum rust-version to 1.51 to fix Rust 1.45.0 CI failure
  • Loading branch information
valenting authored Aug 17, 2022
2 parents a72f83d + 275baae commit d6b4cda
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
rust: [1.45.0, stable, beta, nightly]
rust: [1.51.0, stable, beta, nightly]
exclude:
- os: macos-latest
rust: 1.45.0
rust: 1.51.0
- os: windows-latest
rust: 1.45.0
rust: 1.51.0
- os: macos-latest
rust: beta
- os: windows-latest
Expand Down
2 changes: 1 addition & 1 deletion data-url/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository = "https://github.com/servo/rust-url"
license = "MIT OR Apache-2.0"
edition = "2018"
autotests = false
rust-version = "1.45"
rust-version = "1.51"

[dev-dependencies]
tester = "0.9"
Expand Down
2 changes: 1 addition & 1 deletion form_urlencoded/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Parser and serializer for the application/x-www-form-urlencoded s
repository = "https://github.com/servo/rust-url"
license = "MIT OR Apache-2.0"
edition = "2018"
rust-version = "1.45"
rust-version = "1.51"

[lib]
test = false
Expand Down
2 changes: 1 addition & 1 deletion idna/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository = "https://github.com/servo/rust-url/"
license = "MIT OR Apache-2.0"
autotests = false
edition = "2018"
rust-version = "1.45"
rust-version = "1.51"

[lib]
doctest = false
Expand Down
2 changes: 1 addition & 1 deletion percent_encoding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Percent encoding and decoding"
repository = "https://github.com/servo/rust-url/"
license = "MIT OR Apache-2.0"
edition = "2018"
rust-version = "1.45"
rust-version = "1.51"

[features]
default = ["alloc"]
Expand Down
2 changes: 1 addition & 1 deletion url/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["parser-implementations", "web-programming", "encoding"]
license = "MIT OR Apache-2.0"
include = ["src/**/*", "LICENSE-*", "README.md", "tests/**"]
edition = "2018"
rust-version = "1.45"
rust-version = "1.51"

[badges]
travis-ci = { repository = "servo/rust-url" }
Expand Down
4 changes: 2 additions & 2 deletions url/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ impl fmt::Display for SyntaxViolation {
}
}

#[derive(Copy, Clone, PartialEq)]
#[derive(Copy, Clone, PartialEq, Eq)]
pub enum SchemeType {
File,
SpecialNotFile,
Expand Down Expand Up @@ -1561,7 +1561,7 @@ pub fn is_windows_drive_letter(segment: &str) -> bool {
/// Whether path starts with a root slash
/// and a windows drive letter eg: "/c:" or "/a:/"
fn path_starts_with_windows_drive_letter(s: &str) -> bool {
if let Some(c) = s.as_bytes().get(0) {
if let Some(c) = s.as_bytes().first() {
matches!(c, b'/' | b'\\' | b'?' | b'#') && starts_with_windows_drive_letter(&s[1..])
} else {
false
Expand Down

0 comments on commit d6b4cda

Please sign in to comment.