diff --git a/.forgejo/workflows/ci.yaml b/.github/workflows/ci.yaml similarity index 53% rename from .forgejo/workflows/ci.yaml rename to .github/workflows/ci.yaml index 80e25b0..fb87a7a 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,12 +5,13 @@ on: jobs: checks: - runs-on: nix + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: https://codeberg.org/icewind/attic-action@v1 + - uses: cachix/install-nix-action@v26 + - uses: icewind1991/attic-action@v1 with: - name: link - instance: https://cache.icewind.link + name: ci + instance: https://cache.icewind.me authToken: "${{ secrets.ATTIC_TOKEN }}" - run: nix flake check --keep-going diff --git a/Cargo.lock b/Cargo.lock index 50c48bc..ecad56e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "rfc7239" -version = "0.1.3" +version = "0.1.2" dependencies = [ "uncased", ] @@ -20,6 +20,6 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" diff --git a/Cargo.toml b/Cargo.toml index d65019a..afe8928 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,17 +1,13 @@ [package] name = "rfc7239" -version = "0.1.3" +version = "0.1.2" authors = ["Robin Appelman "] edition = "2018" description = "Parser for rfc7239 formatted Forwarded headers" license = "MIT OR Apache-2.0" -repository = "https://codeberg.org/icewind/rfc7239" +repository = "https://github.com/icewind1991/rfc7239" documentation = "https://docs.rs/rfc7239" rust-version = "1.56.1" [dependencies] uncased = "0.9.10" - -[features] -std = [] -default = ["std"] \ No newline at end of file diff --git a/README.md b/README.md index fae079b..77d3d1f 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,4 @@ for node_result in parse(header_value) { } ``` -## `no_std` - -This crate can be used in a `no_std` environment by disabling the default `std` -feature. - -The only impact disabling this feature has is using `core::error::Error` and -`core::net::IpAddr` instead of the `std` variants and increasing the msrv to -1.81. - [rfc7239]: https://tools.ietf.org/html/rfc7239 diff --git a/flake.lock b/flake.lock index eb5effb..c377800 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1742394900, - "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1747659009, - "narHash": "sha256-3FFAthqh4rWKTClF+WgM+9CmMDlnfWcPdd3hGBFVNHc=", + "lastModified": 1732697024, + "narHash": "sha256-GcLauDQQI4xO4vy3e2QxPneR86FsJ1ubAbFDlTyEZ9s=", "owner": "nix-community", "repo": "flakelight", - "rev": "93d72adbe0b022791b0faadfb31cb6e98c37f0ad", + "rev": "1af817b5987e78b7a260dff6d62793716b98d794", "type": "github" }, "original": { @@ -44,31 +44,31 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1747928985, - "narHash": "sha256-OGJvoEbcclL566m9PCq+SdOQ9vJzLfVCOkww9L/uZT8=", - "ref": "refs/heads/main", - "rev": "742b8596357b53bf437d504a87455f46edba8be2", - "revCount": 46, - "type": "git", - "url": "https://codeberg.org/icewind/mill-scale.git" + "lastModified": 1732306573, + "narHash": "sha256-wE12kIIE0qb9V9y0JiVm5RsRrMNX+KeeMwkzwefdHhY=", + "owner": "icewind1991", + "repo": "mill-scale", + "rev": "8b4cbf174a9728d7e58bbfde5b5a6685dcbf1015", + "type": "github" }, "original": { - "type": "git", - "url": "https://codeberg.org/icewind/mill-scale.git" + "owner": "icewind1991", + "repo": "mill-scale", + "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1747862697, - "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", + "lastModified": 1732632634, + "narHash": "sha256-+G7n/ZD635aN0sEXQLynU7pWMd3PKDM7yBIXvYmjABQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", + "rev": "6f6076c37180ea3a916f84928cf3a714c5207a30", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1742697269, - "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ddacbeb..4fffa0a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { inputs = { - nixpkgs.url = "nixpkgs/nixos-24.11"; + nixpkgs.url = "nixpkgs/nixos-24.05"; flakelight = { url = "github:nix-community/flakelight"; inputs.nixpkgs.follows = "nixpkgs"; }; mill-scale = { - url = "git+https://codeberg.org/icewind/mill-scale.git"; + url = "github:icewind1991/mill-scale"; inputs.flakelight.follows = "flakelight"; }; }; - outputs = {mill-scale, ...}: mill-scale ./. {}; + outputs = { mill-scale, ... }: mill-scale ./. { }; } diff --git a/src/lib.rs b/src/lib.rs index 49d279b..6389281 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,12 +1,10 @@ -#![cfg_attr(not(feature = "std"), no_std)] - //! Parser for [rfc7239] formatted `Forwarded` headers. //! //! ## Usage //! //! ``` //! use rfc7239::parse; -//! # use core::error::Error; +//! # use std::error::Error; //! //! # fn main() -> Result<(), Box> { //! // get the header value from your favorite http server library @@ -23,26 +21,10 @@ //! ``` //! //! [rfc7239]: https://tools.ietf.org/html/rfc7239 - -#[cfg(all(test, not(feature = "std")))] -extern crate std; -#[cfg(all(test, not(feature = "std")))] -use std::{format, vec, vec::Vec}; - -#[cfg(not(feature = "std"))] -use core::{ - error::Error, - fmt::{Debug, Display, Formatter}, - net::IpAddr, - str::FromStr, -}; -#[cfg(feature = "std")] -use std::{ - error::Error, - fmt::{Debug, Display, Formatter}, - net::IpAddr, - str::FromStr, -}; +use std::error::Error; +use std::fmt::{Debug, Display, Formatter}; +use std::net::IpAddr; +use std::str::FromStr; use uncased::UncasedStr; #[derive(Debug)] @@ -54,7 +36,7 @@ pub enum RfcError { } impl Display for RfcError { - fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { let str = match self { RfcError::InvalidIdentifier => "Invalid node identifier", RfcError::InvalidPort => "Invalid node port", @@ -132,8 +114,8 @@ impl<'a> Forwarded<'a> { } } -impl Display for Forwarded<'_> { - fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result { +impl<'a> Display for Forwarded<'a> { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { let mut needs_delim = false; if let Some(ident) = &self.forwarded_for { if ident.display_needs_quote() { @@ -265,8 +247,8 @@ impl<'a> NodeIdentifier<'a> { } } -impl Display for NodeIdentifier<'_> { - fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result { +impl<'a> Display for NodeIdentifier<'a> { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { match self.port { Some(port) => write!(f, "{}:{}", self.name, port), None => write!(f, "{}", self.name), @@ -393,8 +375,8 @@ impl<'a> NodeName<'a> { } } -impl Display for NodeName<'_> { - fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result { +impl<'a> Display for NodeName<'a> { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { match self { NodeName::Ip(IpAddr::V4(ip)) => write!(f, "{}", ip), NodeName::Ip(IpAddr::V6(ip)) => write!(f, "[{}]", ip),