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 @@ -18,7 +18,7 @@ defaults:

env:
RUST_LOG: "clash_lib=TRACE"
RUST_TOOLCHAIN: "stable"
RUST_TOOLCHAIN: "1.99.1"
RUSTC_BOOTSTRAP: "1"
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}

Expand All @@ -29,7 +29,7 @@ jobs:
secrets:
sentry-dsn: ${{ secrets.SENTRY_DSN }}
with:
rust-toolchain: "stable"
rust-toolchain: "1.99.1"
packages: "clash-rs"
target-config-file: ${{ github.event_name == 'pull_request' && '.github/target-pr.toml' || '.github/target.toml' }}
rustflags: ""
Expand Down
2 changes: 1 addition & 1 deletion clash-lib/src/app/outbound/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ impl OutboundManager {
);
selector_control.insert(
proto.name.clone(),
url_test_arc.clone() as ThreadSafeSelectorControl,
url_test_arc as ThreadSafeSelectorControl,
);
}
OutboundGroupProtocol::Fallback(proto) => {
Expand Down
2 changes: 1 addition & 1 deletion clash-lib/src/app/outbound/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pub fn proxy_groups_dag_sort(
let group_len = groups.len();

while !queue.is_empty() {
let name = queue.pop_front().unwrap().to_owned();
let name = queue.pop_front().unwrap();
let node = graph
.get(&name)
.unwrap_or_else(|| panic!("node {name} not found"));
Expand Down
2 changes: 1 addition & 1 deletion clash-lib/src/common/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ impl PlainAuthenticator {
let mut usernames = Vec::new();
for user in users {
store.insert(user.0.clone(), user.1.clone());
usernames.push(user.0.clone());
usernames.push(user.0);
}
Self { store, usernames }
}
Expand Down
4 changes: 2 additions & 2 deletions clash-lib/src/common/dashboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ fn extract_zip(bytes: &[u8], target_dir: &Path) -> Result<(), Error> {
// result uses native separators on all platforms.
stripped.split('/').filter(|c| !c.is_empty()).collect()
}
None => enclosed.clone(),
None => enclosed,
};
if rel.as_os_str().is_empty() {
continue;
Expand Down Expand Up @@ -338,7 +338,7 @@ fn extract_tgz(bytes: &[u8], target_dir: &Path) -> Result<(), Error> {
.unwrap_or(&path)
.to_path_buf()
}
None => path.clone(),
None => path,
};

if rel.as_os_str().is_empty() {
Expand Down
1 change: 0 additions & 1 deletion clash-lib/src/proxy/mixed/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ impl InboundHandlerTrait for MixedInbound {

_ => {
let src = src_addr;
let dispatcher = dispatcher.clone();
let authenticator = authenticator.clone();
tokio::spawn(async move {
http::handle_http(
Expand Down
5 changes: 4 additions & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[toolchain]
channel = "stable"
# Pinned below 1.100: its new build-dir layout passes one `-L` per dependency,
# which makes rustc command lines exceed the Windows 32K limit under sccache
# (os error 206 building tor-keymgr). Move back to "stable" once that is fixed.
channel = "1.99.1"
Loading