From a96964eeddaf7ab0d4a2146da7e04b8ccd8bda95 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 1 Oct 2019 12:26:13 +0000 Subject: [PATCH] servo: Merge #17780 - Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02) (from servo:cargoup); r=nox,SimonSapin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cargo binaries are now produced on Rust’s CI, not Cargo’s. Remove cargo-commit-hash and find Cargo based on rust-commit-hash. Unfortunately, Cargo binaries are not available for every Cargo PR anymore: https://github.com/rust-lang/cargo/pull/4123#issuecomment-316201869 Source-Repo: https://github.com/servo/servo Source-Revision: d403f404382c66485d9744787ce021556be59d6c UltraBlame original commit: 380ad1bfb187a075e540ffaf07e2c104d6c00a13 --- servo/Cargo.lock | 113 +++++++++++++++- servo/appveyor.yml | 10 -- servo/cargo-commit-hash | 1 - servo/python/servo/bootstrap_commands.py | 158 +++++++---------------- servo/python/servo/command_base.py | 7 +- servo/python/servo/devenv_commands.py | 142 -------------------- 6 files changed, 161 insertions(+), 270 deletions(-) delete mode 100644 servo/cargo-commit-hash diff --git a/servo/Cargo.lock b/servo/Cargo.lock index 413b7236c272c..bb843de8fad55 100644 --- a/servo/Cargo.lock +++ b/servo/Cargo.lock @@ -21226,7 +21226,7 @@ version . 0 . -13 +16 " source = @@ -21343,6 +21343,35 @@ io index ) " +" +vcpkg +0 +. +2 +. +2 +( +registry ++ +https +: +/ +/ +github +. +com +/ +rust +- +lang +/ +crates +. +io +- +index +) +" ] [ [ @@ -22975,7 +23004,7 @@ sys . 0 . -13 +16 ( registry + @@ -45322,6 +45351,48 @@ package name = " +vcpkg +" +version += +" +0 +. +2 +. +2 +" +source += +" +registry ++ +https +: +/ +/ +github +. +com +/ +rust +- +lang +/ +crates +. +io +- +index +" +[ +[ +package +] +] +name += +" vec_map " version @@ -53432,7 +53503,7 @@ sys . 0 . -13 +16 ( registry + @@ -53457,7 +53528,7 @@ index " = " -e5ee912a45d686d393d5ac87fac15ba0ba18daae14e8e7543c63ebf7fb7e970c +3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8 " " checksum @@ -58235,6 +58306,40 @@ b5d0f5103675a280a926ec2f9b7bcc2ef49367df54e8c570c3311fec919f9a8b " " checksum +vcpkg +0 +. +2 +. +2 +( +registry ++ +https +: +/ +/ +github +. +com +/ +rust +- +lang +/ +crates +. +io +- +index +) +" += +" +9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b +" +" +checksum vec_map 0 . diff --git a/servo/appveyor.yml b/servo/appveyor.yml index 9152277a7432f..acc25ebe04862 100644 --- a/servo/appveyor.yml +++ b/servo/appveyor.yml @@ -413,11 +413,6 @@ rust commit - hash -cargo -- -commit -- -hash - . cargo @@ -428,11 +423,6 @@ rust commit - hash -cargo -- -commit -- -hash - . ccache diff --git a/servo/cargo-commit-hash b/servo/cargo-commit-hash deleted file mode 100644 index 78b19407e07f8..0000000000000 --- a/servo/cargo-commit-hash +++ /dev/null @@ -1 +0,0 @@ -2233f515b1e8281841ceaed802f74fe2f9e54701 diff --git a/servo/python/servo/bootstrap_commands.py b/servo/python/servo/bootstrap_commands.py index ddc28d81211df..43899751bb36f 100644 --- a/servo/python/servo/bootstrap_commands.py +++ b/servo/python/servo/bootstrap_commands.py @@ -1823,7 +1823,7 @@ - ci / -cargo +rustc - builds / @@ -1842,6 +1842,16 @@ cargo_build_id ( ) +[ +len +( +" +rust +- +" +) +: +] tgz_file ) @@ -2631,14 +2641,6 @@ ( ) -cargo_current -= -self -. -cargo_build_id -( -) - print ( " @@ -2675,44 +2677,11 @@ ) ) -print -( -" -Current -Cargo -version -: -{ -} -" -. -format -( -cargo_current -) -) - to_keep = -{ - -' -rust -' -: set ( ) - -' -cargo -' -: -set -( -) - -} if int @@ -2725,11 +2694,6 @@ : to_keep -[ -' -rust -' -] . add ( @@ -2737,42 +2701,18 @@ ) to_keep -[ -' -rust -' -] . add ( rust_current_stable ) - -to_keep -[ -' -cargo -' -] -. -add -( -cargo_current -) else : for -tool -version_files +version_file in -{ - -' -rust -' -: [ ' rust @@ -2789,41 +2729,15 @@ version ' ] - -' -cargo -' -: -[ -' -cargo -- -commit -- -hash -' -] - -} -. -items -( -) : -for -version_file -in -version_files -: - cmd = subprocess . Popen ( - + [ ' git @@ -2855,19 +2769,19 @@ ' version_file ] - + stdout = subprocess . PIPE - + universal_newlines = True - + ) - + stdout _ = @@ -2876,7 +2790,7 @@ communicate ( ) - + for line in @@ -2886,7 +2800,7 @@ ( ) : - + if line . @@ -2911,11 +2825,8 @@ " ) : - + to_keep -[ -tool -] . add ( @@ -2980,6 +2891,32 @@ ) : +if +name +. +startswith +( +" +rust +- +" +) +: + +name += +name +[ +len +( +" +rust +- +" +) +: +] + if name . @@ -2995,9 +2932,6 @@ not in to_keep -[ -tool -] : removing_anything diff --git a/servo/python/servo/command_base.py b/servo/python/servo/command_base.py index 1e668ff3c3309..98e31799e3bb0 100644 --- a/servo/python/servo/command_base.py +++ b/servo/python/servo/command_base.py @@ -2469,7 +2469,7 @@ . topdir " -cargo +rust - commit - @@ -2490,6 +2490,11 @@ . _cargo_build_id = +" +rust +- +" ++ f . read diff --git a/servo/python/servo/devenv_commands.py b/servo/python/servo/devenv_commands.py index 7b8634e4616cb..49a57c5f141ec 100644 --- a/servo/python/servo/devenv_commands.py +++ b/servo/python/servo/devenv_commands.py @@ -2405,148 +2405,6 @@ False ) -self -. -fetch -( -) - -Command -( -' -cargoup -' - -description -= -' -Update -the -Cargo -version -to -latest -master -' - -category -= -' -devenv -' -) - -def -cargoup -( -self -) -: - -url -= -" -https -: -/ -/ -api -. -github -. -com -/ -repos -/ -rust -- -lang -/ -cargo -/ -git -/ -refs -/ -heads -/ -master -" - -commit -= -json -. -load -( -urllib2 -. -urlopen -( -url -) -) -[ -" -object -" -] -[ -" -sha -" -] - -filename -= -path -. -join -( -self -. -context -. -topdir -" -cargo -- -commit -- -hash -" -) - -with -open -( -filename -" -w -" -) -as -f -: - -f -. -write -( -commit -+ -" -\ -n -" -) - -self -. -_cargo_build_id -= -None - self . set_cargo_root