Skip to content

Commit

Permalink
make trait parameter more open, no need for 'static
Browse files Browse the repository at this point in the history
Note that this is already a breaking change earlier.
  • Loading branch information
Byron committed Nov 9, 2022
1 parent b9a5eea commit 68dc86f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions git-protocol/src/fetch/delegate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ pub trait DelegateBlocking {
&mut self,
_server: &Capabilities,
_arguments: &mut Vec<BString>,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
) -> std::io::Result<LsRefsAction> {
Ok(LsRefsAction::Continue)
}
Expand All @@ -76,7 +76,7 @@ pub trait DelegateBlocking {
&mut self,
_version: git_transport::Protocol,
_server: &Capabilities,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
_refs: &[Ref],
) -> std::io::Result<Action> {
Ok(Action::Continue)
Expand Down Expand Up @@ -126,7 +126,7 @@ impl<T: DelegateBlocking> DelegateBlocking for Box<T> {
&mut self,
_server: &Capabilities,
_arguments: &mut Vec<BString>,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
) -> io::Result<LsRefsAction> {
self.deref_mut().prepare_ls_refs(_server, _arguments, _features)
}
Expand All @@ -135,7 +135,7 @@ impl<T: DelegateBlocking> DelegateBlocking for Box<T> {
&mut self,
_version: git_transport::Protocol,
_server: &Capabilities,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
_refs: &[Ref],
) -> io::Result<Action> {
self.deref_mut().prepare_fetch(_version, _server, _features, _refs)
Expand All @@ -160,7 +160,7 @@ impl<T: DelegateBlocking> DelegateBlocking for &mut T {
&mut self,
_server: &Capabilities,
_arguments: &mut Vec<BString>,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
) -> io::Result<LsRefsAction> {
self.deref_mut().prepare_ls_refs(_server, _arguments, _features)
}
Expand All @@ -169,7 +169,7 @@ impl<T: DelegateBlocking> DelegateBlocking for &mut T {
&mut self,
_version: git_transport::Protocol,
_server: &Capabilities,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
_refs: &[Ref],
) -> io::Result<Action> {
self.deref_mut().prepare_fetch(_version, _server, _features, _refs)
Expand Down
10 changes: 5 additions & 5 deletions git-protocol/tests/fetch/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl fetch::DelegateBlocking for CloneDelegate {
&mut self,
_version: git_transport::Protocol,
_server: &Capabilities,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
_refs: &[fetch::Ref],
) -> io::Result<Action> {
match self.abort_with.take() {
Expand Down Expand Up @@ -72,7 +72,7 @@ impl fetch::DelegateBlocking for CloneRefInWantDelegate {
&mut self,
_server: &Capabilities,
_arguments: &mut Vec<BString>,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
) -> io::Result<LsRefsAction> {
Ok(LsRefsAction::Skip)
}
Expand All @@ -81,7 +81,7 @@ impl fetch::DelegateBlocking for CloneRefInWantDelegate {
&mut self,
_version: git_transport::Protocol,
_server: &Capabilities,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
refs: &[fetch::Ref],
) -> io::Result<Action> {
self.refs = refs.to_owned();
Expand Down Expand Up @@ -111,7 +111,7 @@ impl fetch::DelegateBlocking for LsRemoteDelegate {
&mut self,
_server: &Capabilities,
_arguments: &mut Vec<BString>,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
) -> std::io::Result<LsRefsAction> {
match self.abort_with.take() {
Some(err) => Err(err),
Expand All @@ -122,7 +122,7 @@ impl fetch::DelegateBlocking for LsRemoteDelegate {
&mut self,
_version: git_transport::Protocol,
_server: &Capabilities,
_features: &mut Vec<(&str, Option<Cow<'static, str>>)>,
_features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
refs: &[fetch::Ref],
) -> io::Result<fetch::Action> {
self.refs = refs.to_owned();
Expand Down

0 comments on commit 68dc86f

Please sign in to comment.