OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-10-24 01:47:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

var_os() -> var() (back)

Browse source
This commit is contained in:
Mr-Andersen 2020-02-24 20:43:45 +03:00
parent ddefd9e8a6
commit a326860d4b
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/bot/mod.rs
View file

@ -20,12 +20,12 @@ impl Bot {
///
/// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
pub fn from_env() -> Arc<Self> {
match std::env::var_os("TELOXIDE_PROXY") {
match std::env::var("TELOXIDE_PROXY").ok() {
Some(proxy) => Self::from_env_with_client(
Client::builder()
.proxy(
reqwest::Proxy::all(
&*proxy.to_string_lossy(),
&proxy,
)
.expect("creating reqwest::Proxy"),
)
@ -45,9 +45,8 @@ impl Bot {
/// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
pub fn from_env_with_client(client: Client) -> Arc<Self> {
Self::with_client(
&*std::env::var_os("TELOXIDE_TOKEN")
.expect("Cannot get the TELOXIDE_TOKEN env variable")
.to_string_lossy(),
&std::env::var("TELOXIDE_TOKEN")
.expect("Cannot get the TELOXIDE_TOKEN env variable"),
client,
)
}