Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update indexmap dependency & fix compiler warnings #758

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

serprex
Copy link

@serprex serprex commented Dec 27, 2023

#741 proposes changing get_ready_index_mut's signature, but that would be a semver breaking change, so can wait for 0.5

Also remove unused lazy_static dev dependency

tower/Cargo.toml Outdated Show resolved Hide resolved
serprex and others added 2 commits January 12, 2024 19:53
Co-authored-by: Josh Stone <cuviper@gmail.com>
Co-authored-by: Josh Stone <cuviper@gmail.com>
@Mr-Leshiy
Copy link

Also this PR fixed an old problem with indexmap #466.
indexmap 1.5.2 release added a new feature flag std which can totally solve corresponding issue with not identifying indexmap-rs/indexmap#145, std indexmap-rs/indexmap#151.

Copy link

@cuviper cuviper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewing as requested, but note that I'm not a maintainer here.

@@ -168,7 +168,7 @@ impl<F: Future> common::Drive<F> for FuturesOrdered<F> {
}

fn push(&mut self, future: F) {
FuturesOrdered::push(self, future)
FuturesOrdered::push_back(self, future)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs futures-util v0.3.22 (or later).

@@ -174,7 +174,7 @@ mod tests {
let mut r = HasherRng::default();
match super::sample_floyd2(&mut r, 2) {
[0, 1] | [1, 0] => (),
err => panic!("{err:?}"),
err => panic!("{:?}", err),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, the previous format would be fine if the crate upgraded to 2021 edition -- which it could do with the new MSRV, but that might be a bigger change than desired right now.

@@ -91,7 +91,6 @@ tower-test = { version = "0.4", path = "../tower-test" }
tracing = { version = "0.1.2", default-features = false, features = ["std"] }
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "ansi"] }
http = "0.2"
lazy_static = "1.4.0"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is needed to fix the minimal version used in tests, per #670, or else you get:

error: cannot find macro `__lazy_static_internal` in this scope
  --> [...]/sharded-slab-0.1.1/src/tid.rs:32:1
   |
32 | / lazy_static! {
33 | |     static ref REGISTRY: Registry = Registry {
34 | |         next: AtomicUsize::new(0),
35 | |         free: Mutex::new(VecDeque::new()),
36 | |     };
37 | | }
   | |_^
   |
   = note: this error originates in the macro `lazy_static` (in Nightly builds, run with -Z macro-backtrace for more info)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants