diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 919d3b6..a8cde21 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,3 +33,11 @@ Any line of the commit message cannot be longer 72 characters. all The body explains the change, and the footer contains relevant changelog notes and references to fixed issues. + +### Release process + +Releases are made using `cargo-release`: + +```bash +cargo release --dry-run 0.10.0 --prev-tag-name v0.9.2 -v +``` diff --git a/Cargo.toml b/Cargo.toml index 0cc90e1..111259a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lettre" -version = "0.9.2" # remember to update html_root_url +version = "0.10.0-pre" # remember to update html_root_url description = "Email client" readme = "README.md" homepage = "https://lettre.at" diff --git a/src/lib.rs b/src/lib.rs index e8b2d5d..008f069 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,7 +3,7 @@ //! This mailer contains the available transports for your emails. //! -#![doc(html_root_url = "https://docs.rs/lettre/0.9.2")] +#![doc(html_root_url = "https://docs.rs/lettre/0.10.0")] #![deny( missing_copy_implementations, trivial_casts, diff --git a/tests/builder/build_with_envelope.rs b/tests/build_with_envelope.rs similarity index 95% rename from tests/builder/build_with_envelope.rs rename to tests/build_with_envelope.rs index 180ac59..75e76be 100644 --- a/tests/builder/build_with_envelope.rs +++ b/tests/build_with_envelope.rs @@ -1,5 +1,5 @@ +use lettre::builder::EmailBuilder; use lettre::{EmailAddress, Envelope}; -use lettre_email::EmailBuilder; #[test] fn build_with_envelope_test() { diff --git a/tests/builder/skeptic.rs b/tests/builder/skeptic.rs deleted file mode 100644 index 43ed564..0000000 --- a/tests/builder/skeptic.rs +++ /dev/null @@ -1,56 +0,0 @@ -use glob::glob; -use std::env; -use std::env::consts::EXE_EXTENSION; -use std::path::Path; -use std::process::Command; - -#[test] -fn book_test() { - let mut book_path = env::current_dir().unwrap(); - let readme = Path::new(file!()) - .parent() - .unwrap() - .parent() - .unwrap() - .parent() - .unwrap() - .join("../README.md"); - book_path.push( - Path::new(file!()) - .parent() - .unwrap() - .parent() - .unwrap() - .parent() - .unwrap() - .join("../website/content/creating-messages"), - ); // For some reasons, calling .parent() once more gives us None... - - for md in glob(&format!("{}/*.md", book_path.to_str().unwrap())).unwrap() { - skeptic_test(&md.unwrap()); - } - skeptic_test(&readme); -} - -fn skeptic_test(path: &Path) { - let rustdoc = Path::new("rustdoc").with_extension(EXE_EXTENSION); - let exe = env::current_exe().unwrap(); - let depdir = exe.parent().unwrap(); - - let mut cmd = Command::new(rustdoc); - cmd.args(&["--verbose", "--test"]) - .arg("-L") - .arg(&depdir) - .arg(path); - - let result = cmd - .spawn() - .expect("Failed to spawn process") - .wait() - .expect("Failed to run process"); - - assert!( - result.success(), - format!("Failed to run rustdoc tests on {:?}!", path) - ); -} diff --git a/website/src/README.md b/website/src/README.md index 4c131fe..893cca8 100644 --- a/website/src/README.md +++ b/website/src/README.md @@ -7,13 +7,9 @@ Lettre is an email library that allows creating and sending messages. It provide * Unicode support (for emails and transports, including for sender et recipient addresses when compatible) * Secure defaults (emails are only sent encrypted by default) -The `lettre_email` crate allows you to compose messages, and the `lettre` -provide transports to send them. - Lettre requires Rust 1.36 or newer. Add the following to your `Cargo.toml`: ```toml [dependencies] -lettre = "0.9" -lettre_email = "0.9" +lettre = "0.10" ``` diff --git a/website/src/sending-messages/_index.md b/website/src/sending-messages/_index.md index 39cfd03..9cf4e55 100644 --- a/website/src/sending-messages/_index.md +++ b/website/src/sending-messages/_index.md @@ -3,7 +3,7 @@ This section explains how to manipulate emails you have created. This mailer contains several different transports for your emails. To be sendable, the -emails have to implement `SendableEmail`, which is the case for emails created with `lettre_email`. +emails have to implement `SendableEmail`, which is the case for emails created with `lettre::builder`. The following transports are available: