Update to 2021-03-25

Author: Jethro Beekman

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "core_io"
-version = "0.1.20190701"
+version = "0.1.20210325"
 authors = ["The Rust Project Developers", "Jethro Beekman"]
 license = "MIT/Apache-2.0"
 description = """

build-src.sh

@@ -68,12 +68,4 @@ for IO_COMMIT in $OLD_COMMITS $(git_commits_ordered %H $NEW_COMMITS|tac); do
 	fi
 done
 
-if [ $(uname) == 'Darwin' ]; then
-	OLD_GIT_PERM=$(stat -f %Op .git)
-else
-	OLD_GIT_PERM=$(stat --printf=%a .git)
-fi
-trap "chmod $OLD_GIT_PERM .git; exit 1" SIGINT
-chmod 000 .git
-cargo ${1:-package}
-chmod $OLD_GIT_PERM .git
+cargo ${1:-package} --allow-dirty

build.rs

@@ -12,7 +12,7 @@ fn parse_mappings(mut mappings: &'static str) -> Vec<Mapping> {
 	// is why it's kind of weird. It should be changed to a saner format.
 
 	const P1: &'static str = r#"-Mapping(""#;
-	const P2: &'static str = r#"",""#; ;
+	const P2: &'static str = r#"",""#;
 	const P3: &'static str = "\")\n";
 
 	trait TakePrefix: Sized {

edit-patches.sh

@@ -25,6 +25,7 @@ prompt_changes() {
 	bold_arrow; echo "Replacing $IO_COMMIT.patch with updated version"
 	git diff > $TMP_PATCH
 	git clean -f -x
+	git reset -q HEAD~
 	git diff > $PATCH_DIR/$IO_COMMIT.patch
 	rm -rf .git
 }

functions.sh

@@ -26,7 +26,7 @@ echo_lines() {
 
 get_io_commits() {
 	for COMPILER_COMMIT in $COMPILER_COMMITS; do
-		IO_COMMIT=$(git log -n1 --pretty=format:%H $COMPILER_COMMIT -- src/libstd/io)
+		IO_COMMIT=$(git log -n1 --pretty=format:%H $COMPILER_COMMIT -- src/libstd/io library/std/src/io)
 		if ! grep -q $COMPILER_COMMIT mapping.rs; then
 			echo "-Mapping(\"$COMPILER_COMMIT\",\"$IO_COMMIT\")" >> mapping.rs
 		fi
@@ -40,8 +40,14 @@ get_patch_commits() {
 
 prepare_version() {
 	mkdir src/$IO_COMMIT
-	git_extract src/libstd/io/
-	if git_file_exists src/libcore/slice/memchr.rs; then
+	if git_file_exists library/std/src/io/mod.rs; then
+		git_extract library/std/src/io/
+	else
+		git_extract src/libstd/io/
+	fi
+	if git_file_exists library/core/src/slice/memchr.rs; then
+		true
+	elif git_file_exists src/libcore/slice/memchr.rs; then
 		true
 	elif git_file_exists src/libstd/sys_common/memchr.rs; then
 		git_extract src/libstd/sys_common/memchr.rs
@@ -84,6 +90,6 @@ bash_diff_loop() {
 					;;
 			esac
 		done
-		bash <> /dev/stderr
+		bash --rcfile <(custom_bashrc) <> /dev/stderr
 	done
 }