mirror of
https://github.com/Llewellynvdm/starship.git
synced 2024-11-24 13:47:38 +00:00
improvement: replace reqwest with attohttpc (#999)
This commit is contained in:
parent
8479e72b3e
commit
fef8cc8bbd
8
.github/workflows/workflow.yml
vendored
8
.github/workflows/workflow.yml
vendored
@ -225,11 +225,19 @@ jobs:
|
|||||||
run: sudo apt-get install -y musl-tools
|
run: sudo apt-get install -y musl-tools
|
||||||
|
|
||||||
- name: Build target
|
- name: Build target
|
||||||
|
if: matrix.target != 'x86_64-unknown-linux-musl'
|
||||||
uses: actions-rs/cargo@v1
|
uses: actions-rs/cargo@v1
|
||||||
with:
|
with:
|
||||||
command: build
|
command: build
|
||||||
args: --release --target ${{ matrix.target }}
|
args: --release --target ${{ matrix.target }}
|
||||||
|
|
||||||
|
- name: Build target (musl)
|
||||||
|
if: matrix.target == 'x86_64-unknown-linux-musl'
|
||||||
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: build
|
||||||
|
args: --release --features tls-vendored --target ${{ matrix.target }}
|
||||||
|
|
||||||
- name: Prepare build artifacts [Windows]
|
- name: Prepare build artifacts [Windows]
|
||||||
if: matrix.os == 'windows-latest'
|
if: matrix.os == 'windows-latest'
|
||||||
run: |
|
run: |
|
||||||
|
730
Cargo.lock
generated
730
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
12
Cargo.toml
12
Cargo.toml
@ -22,7 +22,10 @@ maintenance = { status = "actively-developed" }
|
|||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["battery", "http"]
|
default = ["battery", "http"]
|
||||||
http = ["reqwest"]
|
http = ["attohttpc"]
|
||||||
|
# Vendor OpenSSL, use this if you have trouble cross-compiling starship
|
||||||
|
tls-vendored = ["native-tls/vendored"]
|
||||||
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = "2.33.0"
|
clap = "2.33.0"
|
||||||
@ -51,13 +54,14 @@ regex = "1.3.5"
|
|||||||
os_info = "2.0.1"
|
os_info = "2.0.1"
|
||||||
urlencoding = "1.0.0"
|
urlencoding = "1.0.0"
|
||||||
open = "1.4.0"
|
open = "1.4.0"
|
||||||
# OpenSSL causes problems when building a MUSL release. Opting to use native SSL implementation
|
|
||||||
# see: https://github.com/richfelker/musl-cross-make/issues/65#issuecomment-509790889
|
|
||||||
reqwest = { version = "0.10.4", default-features = false, optional = true, features = ["blocking", "rustls-tls"] }
|
|
||||||
unicode-width = "0.1.7"
|
unicode-width = "0.1.7"
|
||||||
textwrap = "0.11.0"
|
textwrap = "0.11.0"
|
||||||
term_size = "0.3.1"
|
term_size = "0.3.1"
|
||||||
|
|
||||||
|
# Optional/http:
|
||||||
|
attohttpc = { version = "0.12.0", optional = true, default-features = false, features = ["tls", "form"] }
|
||||||
|
native-tls = { version = "0.2", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = "3.1.0"
|
tempfile = "3.1.0"
|
||||||
|
|
||||||
|
@ -32,13 +32,12 @@ pub fn create() {
|
|||||||
|
|
||||||
#[cfg(feature = "http")]
|
#[cfg(feature = "http")]
|
||||||
fn shorten_link(link: &str) -> Option<String> {
|
fn shorten_link(link: &str) -> Option<String> {
|
||||||
reqwest::blocking::Client::new()
|
attohttpc::post(&format!("{}{}", GIT_IO_BASE_URL, "create"))
|
||||||
.post(&format!("{}{}", GIT_IO_BASE_URL, "create"))
|
|
||||||
.form(&[("url", link)])
|
.form(&[("url", link)])
|
||||||
.send()
|
|
||||||
.and_then(|response| response.text())
|
|
||||||
.map(|slug| format!("{}{}", GIT_IO_BASE_URL, slug))
|
|
||||||
.ok()
|
.ok()
|
||||||
|
.and_then(|r| r.send().ok())
|
||||||
|
.and_then(|r| r.text().ok())
|
||||||
|
.map(|slug| format!("{}{}", GIT_IO_BASE_URL, slug))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(feature = "http"))]
|
#[cfg(not(feature = "http"))]
|
||||||
|
Loading…
Reference in New Issue
Block a user