Merge #62

62: Remove stabilized publish-lockfile feature r=phil-opp a=phil-opp The feature was stabilized/removed in rust-lang/cargo#7026. Now all binaries include the Cargo.lock by default. Fixes #57 Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
rust-osdev · Jul 7, 2019 · a8c99d0 · a8c99d0
2 parents 1ee7ec4 + c286082
commit a8c99d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,10 @@
-cargo-features = ["publish-lockfile"]
-
 [package]
 name = "bootloader"
 version = "0.6.1"
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
 license = "MIT/Apache-2.0"
 description = "An experimental pure-Rust x86 bootloader."
 repository = "https://github.com/rust-osdev/bootloader"
-publish-lockfile = true
 edition = "2018"
 build = "build.rs"
 

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,5 @@
+- Remove stabilized publish-lockfile feature ([#62](https://github.com/rust-osdev/bootloader/pull/62))
+
 # 0.6.1
 
 - Make the physical memory offset configurable through a `BOOTLOADER_PHYSICAL_MEMORY_OFFSET` environment variable ([#58](https://github.com/rust-osdev/bootloader/pull/58)).