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/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v1
- name: Install current stable Rust compiler
- name: Install Rust toolchain
run: |
rustup update
rustup default stable
rustup show
- name: install Just
uses: extractions/setup-just@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Install current stable Rust compiler
- name: Install Rust toolchain
run: |
rustup update
rustup default stable
rustup show

- name: Create version
id: version
Expand Down
11 changes: 0 additions & 11 deletions cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1851,17 +1851,6 @@ fn parse_cidr(src: &str) -> Result<cidr::Ipv4Cidr, cidr::NetworkParseError> {
src.parse::<cidr::Ipv4Cidr>()
}

#[derive(Debug)]
struct StringError(String);

impl std::fmt::Display for StringError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> core::fmt::Result {
self.0.fmt(f)
}
}

impl std::error::Error for StringError {}

struct Printer {
pub render_in_json: bool,
pub render_as_v1: bool,
Expand Down
1 change: 0 additions & 1 deletion cli/src/v1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ mod mesdb;
mod orchestrate;
mod resources;

pub use common::List;
pub use common::ToV1;
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.74.0"
channel = "1.80.0"
components = ["rustfmt", "clippy"]