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
6 changes: 3 additions & 3 deletions .github/workflows/ci-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: recursive
- uses: actions-rust-lang/setup-rust-toolchain@v1
Expand All @@ -44,14 +44,14 @@ jobs:
- macos-latest
- windows-latest
toolchain:
- 1.69
- 1.89
features:
-
- --features tokio
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: recursive
- uses: actions-rust-lang/setup-rust-toolchain@v1
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
rustfmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly
Expand All @@ -19,7 +19,7 @@ jobs:
clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
components: clippy
Expand All @@ -42,7 +42,7 @@ jobs:
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: recursive
- uses: actions-rust-lang/setup-rust-toolchain@v1
Expand All @@ -60,14 +60,14 @@ jobs:
- macos-latest
- windows-latest
toolchain:
- 1.69
- 1.89
features:
-
- --features tokio
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
submodules: recursive
- uses: actions-rust-lang/setup-rust-toolchain@v1
Expand Down
86 changes: 67 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Created by https://www.gitignore.io/api/intellij+all

### Intellij+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
Expand All @@ -11,6 +9,12 @@
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
Expand All @@ -28,9 +32,14 @@
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/
Expand All @@ -53,6 +62,9 @@ atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
Expand All @@ -62,27 +74,23 @@ fabric.properties
# Editor-based Rest Client
.idea/httpRequests

### Intellij+all Patch ###
# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360

.idea/

# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023

*.iml
modules.xml
.idea/misc.xml
*.ipr
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij+all Patch ###
# Ignore everything but code style settings and run configurations
# that are supposed to be shared within teams.

# End of https://www.gitignore.io/api/intellij+all
.idea/*

!.idea/codeStyles
!.idea/runConfigurations

### Rust ###
# Generated by Cargo
# will have compiled files and executables
/target/
debug/
target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand All @@ -91,5 +99,45 @@ Cargo.lock
# These are backup files generated by rustfmt
**/*.rs.bk


# End of https://www.gitignore.io/api/rust
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

### Vim ###
# Swap
[._]*.s[a-v][a-z]
!*.svg # comment out if you don't need vector files
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]

# Session
Session.vim
Sessionx.vim

# Temporary
.netrwhist
*~
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets

# Local History for Visual Studio Code
.history/

# Built Visual Studio Code Extensions
*.vsix

### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide
25 changes: 12 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
[package]
name = "whois-rust"
version = "1.6.0"
version = "2.0.0"
authors = ["Magic Len <len@magiclen.org>"]
edition = "2021"
rust-version = "1.69"
edition = "2024"
rust-version = "1.89"
repository = "https://github.com/magiclen/whois-rust"
homepage = "https://magiclen.org/whois-rust"
keywords = ["whois"]
categories = ["web-programming::websocket"]
categories = ["network-programming"]
description = "This is a WHOIS client library for Rust, inspired by https://github.com/hjr265/node-whois"
license = "MIT"
include = ["src/**/*", "Cargo.toml", "README.md", "LICENSE"]

[dependencies]
serde_json = "1"
once_cell = "1"
serde_json = "1.0.45"
regex = "1"
trust-dns-client = "0.23"
hickory-client = "0.24"

tokio = { version = "1", features = ["fs", "net", "time", "io-util"], optional = true }
tokio = { version = "1.21", features = ["fs", "net", "time", "io-util"], optional = true }

validators = { version = "0.26", default-features = false, features = ["derive", "host"] }

[dev-dependencies]
tokio = { version = "1", features = ["macros", "rt"] }
tokio = { version = "1.21", features = ["macros", "rt"] }

[dependencies.validators]
version = "0.25"
default-features = false
features = ["derive", "host"]
[features]
tokio = ["dep:tokio"]

[package.metadata.docs.rs]
all-features = true
2 changes: 1 addition & 1 deletion node-whois
Loading
Loading