Merge #62

bors[bot] · phil-opp · bors[bot] · commit a8c99d08158a · 2019-07-07T13:40:29.000Z
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>
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)).

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+- Remove stabilized publish-lockfile feature ([#62](https://github.com/rust-osdev/bootloader/pull/62))`
	`2`	`+`
`1`	`3`	`# 0.6.1`
`2`	`4`
`3`	`5`	- Make the physical memory offset configurable through a `BOOTLOADER_PHYSICAL_MEMORY_OFFSET` environment variable ([#58](https://github.com/rust-osdev/bootloader/pull/58)).