Skip to content

Commit

Permalink
Merge pull request #54 from Plecra/undeprecate-iteration
Browse files Browse the repository at this point in the history
Remove deprecation annotations
  • Loading branch information
ZoeyR authored Jun 25, 2020
2 parents 6d15856 + c89ed77 commit fcdfc49
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 6 deletions.
3 changes: 0 additions & 3 deletions dotenv/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ pub fn from_path<P: AsRef<Path>>(path: P) -> Result<()> {
/// println!("{}={}", key, val);
/// }
/// ```
#[deprecated(since = "0.14.1", note = "please use `from_path` in conjunction with `var` instead")]
pub fn from_path_iter<P: AsRef<Path>>(path: P) -> Result<Iter<File>> {
Ok(Iter::new(File::open(path).map_err(Error::Io)?))
}
Expand Down Expand Up @@ -146,7 +145,6 @@ pub fn from_filename<P: AsRef<Path>>(filename: P) -> Result<PathBuf> {
/// println!("{}={}", key, val);
/// }
/// ```
#[deprecated(since = "0.14.1", note = "please use `from_path` in conjunction with `var` instead")]
pub fn from_filename_iter<P: AsRef<Path>>(filename: P) -> Result<Iter<File>> {
let (_, iter) = Finder::new().filename(filename.as_ref()).find()?;
Ok(iter)
Expand Down Expand Up @@ -177,7 +175,6 @@ pub fn dotenv() -> Result<PathBuf> {
/// println!("{}={}", key, val);
/// }
/// ```
#[deprecated(since = "0.14.1", note = "please use `from_path` in conjunction with `var` instead")]
pub fn dotenv_iter() -> Result<iter::Iter<File>> {
let (_, iter) = Finder::new().find()?;
Ok(iter)
Expand Down
1 change: 0 additions & 1 deletion dotenv/tests/test-dotenv-iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use dotenv::*;
use crate::common::*;

#[test]
#[allow(deprecated)]
fn test_dotenv_iter() {
let dir = make_test_dotenv().unwrap();

Expand Down
1 change: 0 additions & 1 deletion dotenv/tests/test-from-filename-iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use dotenv::*;
use crate::common::*;

#[test]
#[allow(deprecated)]
fn test_from_filename_iter() {
let dir = make_test_dotenv().unwrap();

Expand Down
1 change: 0 additions & 1 deletion dotenv/tests/test-from-path-iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use dotenv::*;
use crate::common::*;

#[test]
#[allow(deprecated)]
fn test_from_path_iter() {
let dir = make_test_dotenv().unwrap();

Expand Down

0 comments on commit fcdfc49

Please sign in to comment.