Skip to content

Commit

Permalink
Merge branch 'master' into equivalent
Browse files Browse the repository at this point in the history
  • Loading branch information
Gianmarco Garrisi committed Feb 28, 2024
2 parents 4609d8b + 6dd30c7 commit e8597a5
Show file tree
Hide file tree
Showing 22 changed files with 4,758 additions and 1,634 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Build

on:
push:
branches: [ "*" ]
pull_request:
branches: [ master ]

env:
CARGO_TERM_COLOR: always
TARGET: thumbv6m-none-eabi

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- run: rustup target add $TARGET
- name: Build
run: cargo build --verbose
- name: Build with serde
run: cargo build --verbose --features serde
- name: Build for no-std
run: cargo build -v -p test-nostd --target=$TARGET
21 changes: 21 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Format

on:
push:
branches: [ "*" ]
pull_request:
branches: [ master ]

env:
CARGO_TERM_COLOR: always
TARGET: thumbv6m-none-eabi

jobs:
format:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Check format
run: cargo fmt --all -- --check
24 changes: 24 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Test

on:
push:
branches: [ "*" ]
pull_request:
branches: [ master ]

env:
CARGO_TERM_COLOR: always
TARGET: thumbv6m-none-eabi

jobs:
test:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Run tests
run: cargo test --verbose
- name: Run tests with serde
run: cargo test --verbose --features serde

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ target/
**/*.rs.bk
Cargo.lock
*~
.lapce/
38 changes: 0 additions & 38 deletions .travis.yml

This file was deleted.

25 changes: 11 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
[package]
name = "priority-queue"
version = "1.0.2"
version = "2.0.0"
authors = ["Gianmarco Garrisi <gianmarcogarrisi@tutanota.com>"]
description = "A Priority Queue implemented as a heap with a function to efficiently change the priority of an item."
repository = "https://github.com/garro95/priority-queue"
documentation = "https://docs.rs/priority-queue"
#readme = "README.rst"
readme = "README.md"
keywords = ["priority", "queue", "heap"]
categories = ["data-structures", "algorithms"]
license = "LGPL-3.0"
edition = "2018"

build = "build.rs"

[badges]
travis-ci = { repository = "garro95/priority-queue", branch = "master" }
license = "LGPL-3.0 OR MPL-2.0"
edition = "2021"

[build-dependencies]
autocfg = "1"

[dependencies]
indexmap = "1"
serde = {version = "1", optional = true}
indexmap = {version = "2", features = [], default-features = false}
serde = { version = "1", optional = true }

[dev-dependencies]
serde_test = "1"
serde_derive = "1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
uuid = {version= "0.8", features = ["v4", "serde"] }
hashbrown = "0.9"
uuid = {version= "1", features = ["v4", "serde"] }
hashbrown = "0.14"

[features]
default = ["std"]
std = ["indexmap/std"]
benchmarks = []

[workspace]
Expand Down
File renamed without changes.
Loading

0 comments on commit e8597a5

Please sign in to comment.