sync upstream #147

vext01 · 2020-11-23T16:58:21Z

No description provided.

… the color escape characters

If the LLVM was externally provided, then we don't currently copy artifacts into the sysroot. This is not necessarily the right choice (in particular, it will require the LLVM dylib to be in the linker's load path at runtime), but the common use case for external LLVMs is distribution provided LLVMs, and in that case they're usually in the standard search path (e.g., /usr/lib) and copying them here is going to cause problems as we may end up with the wrong files and isn't what distributions want. This behavior may be revisited in the future though.

Co-authored-by: Vadim Petrochenkov <[email protected]>

Co-authored-by: Vadim Petrochenkov <[email protected]> Co-authored-by: Jonas Schievink <[email protected]> Co-authored-by: Yuki Okushi <[email protected]>

Co-authored-by: Camelid <[email protected]> Co-authored-by: Mark Rousskov <[email protected]>

…ackline in source rendering

Introduce `TypeVisitor::BreakTy` Implements MCP rust-lang/compiler-team#383. r? `@ghost` cc `@lcnr` `@oli-obk` ~~Blocked on FCP in rust-lang/compiler-team#383.~~

…ith qualifiers inside an `extern "C"` block

Historically the stable tarballs were named after the version number of the specific tool, instead of the version number of Rust. For example, both of the following tarballs were part of the same release: rustc-1.48.0-x86_64-unknown-linux-gnu.tar.xz cargo-0.49.0-x86_64-unknown-linux-gnu.tar.xz PR #77336 changed the dist code to instead use Rust's version number for all the tarballs, regardless of the tool they contain: rustc-1.48.0-x86_64-unknown-linux-gnu.tar.xz cargo-1.48.0-x86_64-unknown-linux-gnu.tar.xz Because of that there is no need anymore to have a separate `cargo` field in src/stage0.txt, as the Cargo version will always be the same as the rustc version. This PR removes the field, simplifying the code and the maintenance work required while producing releases.

…color, r=jyn514 Rustdoc test compiler output color Fixes #72915 We just need to be sure it doesn't break rustdoc doctests' compilation checks. Maybe some other unforeseen consequences too? r? `@ehuss` cc `@rust-lang/rustdoc`

…imulacrum [self-profiling] Include the estimated size of each cgu in the profile This is helpful when looking for CGUs where the size estimate isn't a good indicator of compilation time. I verified that moving the profiling timer call doesn't affect the results. Results: <img width="297" alt="Screen Shot 2020-11-03 at 7 25 04 AM" src="https://user-images.githubusercontent.com/831192/97985503-5901d100-1da6-11eb-9f10-f3e399702952.png"> `measureme` doesn't have support for custom arg names yet so `arg0` is the CGU name and `arg1` is the estimated size.

BTreeMap: address namespace conflicts Fix an annoyance popping up whenever synchronizing the test cases with a version capable of miri-track-raw-pointers. r? `@Mark-Simulacrum`

…k-Simulacrum Add test for eval order for a+=b Yes, the order of evaluation *does* change depending on the types of the operands. Cursed, I know. I've elected to place this test into `expr/compound-assignment` creating both the `expr` directory and the `compound-assignment` directory. I plan in a future PR to also move the `if` directory and the loose `if` tests into `expr/if` and other similar cleanups of the `test/ui` directory. Future work: Test more than just `+=`, but all operators. I don't know if using a macro to generate these tests cases would be okay or not, but it'd be boilerplatey without it. I'm also confident you cannot change the evaluation order of one operator without changing all of them. Future work: Additionally, test more than just `i32 += i32` for the primitive version. I don't actually know the full set of primitive implementations, but I imagine there's enough to cause a combinatorial explosion with the previous future work item. Somewhere on the order of one to two hundred individual functions.

BTreeMap: fix minor testing mistakes in #78903 Mostly a duplicate test case r? `@Mark-Simulacrum`

BTreeMap: swap the names of NodeRef::new and Root::new_leaf #78104 preserved the name of Root::new_leaf to minimize changes, but the resulting names are confusing. r? `@Mark-Simulacrum`

Stabilise `then` Stabilises the lazy variant of rust-lang/rust#64260 now that the FCP [has ended](rust-lang/rust#64260 (comment)). I've kept the original feature gate `bool_to_option` for the strict variant (`then_some`), and created a new insta-stable feature gate `lazy_bool_to_option` for `then`.

Rollup of 10 pull requests Successful merges: - #76941 (Add f{32,64}::is_subnormal) - #77697 (Split each iterator adapter and source into individual modules) - #78305 (Stabilize alloc::Layout const functions) - #78608 (Stabilize refcell_take) - #78793 (Clean up `StructuralEq` docs) - #79267 (BTreeMap: address namespace conflicts) - #79293 (Add test for eval order for a+=b) - #79295 (BTreeMap: fix minor testing mistakes in #78903) - #79297 (BTreeMap: swap the names of NodeRef::new and Root::new_leaf) - #79299 (Stabilise `then`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Insta-stabilize the methods `is_ipv4` and `is_ipv6` of `IpAddr`. Possible because of the recent stabilization of const control flow. Also adds a test for these methods in a const context.

Add #[cold] attribute to `std::process::abort` and `alloc::alloc::handle_alloc_error`

Stabilize `IpAddr::is_ipv4` and `is_ipv6` as const Insta-stabilize the methods `is_ipv4` and `is_ipv6` of `std::net::IpAddr` as const, in the same way as [PR#76198](rust-lang/rust#76198). Possible because of the recent stabilization of const control flow. Part of #76225 and #76205.

… r=dtolnay Impl Default for PhantomPinned `PhantomPinned` is just a marker type, with an obvious default value (the only value). So I can't think of a reason not to do this. Sure, it's used in exotic situations with unsafe code. But the people writing that code can decide for themselves if they can derive `Default`, and in many situations the derived impl will make sense: ```rust #[derive(Default)] struct NeedsPin { marker: PhantomPinned, buf: [u8; 1024], ptr_to_data: Option<*const u8>, } ```

…nc-upstream-20201123

ptersilie · 2020-11-23T21:07:54Z

bors r+

147: sync upstream r=ptersilie a=vext01 Co-authored-by: Guillaume Gomez <[email protected]> Co-authored-by: Mahmut Bulut <[email protected]> Co-authored-by: Pietro Albini <[email protected]> Co-authored-by: Mark Rousskov <[email protected]> Co-authored-by: Erin Power <[email protected]> Co-authored-by: XAMPPRocky <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: ThePuzzlemaker <[email protected]> Co-authored-by: Mara Bos <[email protected]>

bors · 2020-11-23T21:35:22Z

Build failed:

buildbot/ykrustc-buildbot-build-script-hwt

vext01 · 2020-11-24T09:47:08Z

---- sys::unix::kernel_copy::tests::bench_file_to_file_copy stdout ----
thread 'sys::unix::kernel_copy::tests::bench_file_to_file_copy' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }', library/std/src/sys/unix/kernel_copy/tests.rs:71:10
---- sys::unix::kernel_copy::tests::bench_file_to_socket_copy stdout ----
thread 'sys::unix::kernel_copy::tests::bench_file_to_socket_copy' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }', library/std/src/sys/unix/kernel_copy/tests.rs:100:10

I'm hoping this was a fluke, as those tests just use temp dirs.

ltratt · 2020-11-24T09:47:47Z

OK, let's try again.

bors r+

147: sync upstream r=ltratt a=vext01 Co-authored-by: Guillaume Gomez <[email protected]> Co-authored-by: Mahmut Bulut <[email protected]> Co-authored-by: Pietro Albini <[email protected]> Co-authored-by: Mark Rousskov <[email protected]> Co-authored-by: Erin Power <[email protected]> Co-authored-by: XAMPPRocky <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: ThePuzzlemaker <[email protected]> Co-authored-by: Mara Bos <[email protected]>

vext01 · 2020-11-24T09:50:10Z

Thanks.

Yeah, this isn't ideal. In upstream's test:

      let path = crate::env::temp_dir();                                                                                                                                                                            
      let source_path = path.join("copy-spec.source");                                                                                                                                                              
      let sink_path = path.join("copy-spec.sink");

where:

  pub fn temp_dir() -> PathBuf {                                                                                                                                                                                    
      crate::env::var_os("TMPDIR").map(PathBuf::from).unwrap_or_else(|| {                                                                                                                                           
          if cfg!(target_os = "android") {                                                                                                                                                                          
              PathBuf::from("/data/local/tmp")                                                                                                                                                                      
          } else {                                                                                                                                                                                                  
              PathBuf::from("/tmp")                                                                                                                                                                                 
          }                                                                                                                                                                                                         
      })                                                                                                                                                                                                            
  }

So if both Lukas and I were to concurrently test, we might clash.

ltratt · 2020-11-24T09:51:08Z

Can we file an upstream PR to fix this? That code will cause many people problems at some point, including us!

vext01 · 2020-11-24T09:51:34Z

Yeah, I'm looking into it now.

bors · 2020-11-24T10:19:14Z

Build failed:

buildbot/ykrustc-buildbot-build-script-hwt

vext01 · 2020-11-24T10:34:47Z

What's happened now is that those files in /tmp have not been cleaned up. They are owned vext01 so the CI worker can't overwrite them.

I'll manually delete them for now.

vext01 · 2020-11-24T10:35:15Z

Done, please retry.

ptersilie · 2020-11-24T10:44:19Z

bors r+

bors · 2020-11-24T11:25:58Z

Build succeeded:

buildbot/ykrustc-buildbot-build-script-hwt

vext01 · 2020-11-24T11:35:50Z

Fix for the upstream test

GuillaumeGomez and others added 30 commits November 17, 2020 10:33

Update doctest tests

fd4a33c

Correctly detect color support

95ee1fc

Add comment explaining why we can't split on error[{}]: because of…

63785c8

… the color escape characters

Remove unused import

ec10824

Enable AVX512 *epi64 variants by updating stdarch

d701bf9

this is beta 1.49.0

1bac1b4

build-manifest: strip newline from rustc version

e881b4e

Install CI llvm into the library directory

2101eca

Update RELEASES.md for 1.48.0

a9ace8c

Update RELEASES.md

b77adff

Update RELEASES.md

bc41092

Co-authored-by: Vadim Petrochenkov <[email protected]>

Apply suggestions from code review

c321d6a

Co-authored-by: Vadim Petrochenkov <[email protected]> Co-authored-by: Jonas Schievink <[email protected]> Co-authored-by: Yuki Okushi <[email protected]>

Apply suggestions from code review

5921bca

Co-authored-by: Camelid <[email protected]> Co-authored-by: Mark Rousskov <[email protected]>

Update RELEASES.md

51d9591

Update RELEASES.md

dc8d2eb

Update RELEASES.md

949043e

Update RELEASES.md

2317b82

Update RELEASES.md

70d23b1

Update RELEASES.md

c571271

Update RELEASES.md

53597c7

Update RELEASES.md

2f3b6e1

Ensure that the source code display is working with DOS backline

f7886a6

Add test to ensure that no DOS backline (\r\n) doesn't create extra b…

d2df222

…ackline in source rendering

Auto merge of #78779 - LeSeulArtichaut:ty-visitor-return, r=oli-obk

e0ef0fc

Introduce `TypeVisitor::BreakTy` Implements MCP rust-lang/compiler-team#383. r? `@ghost` cc `@lcnr` `@oli-obk` ~~Blocked on FCP in rust-lang/compiler-team#383.~~

Use span_suggestion_verbose instead of span_suggestion for fn w…

92aa0e6

…ith qualifiers inside an `extern "C"` block

Fix ui tests for fns with qualifiers in extern blocks

b8ed466

m-ou-se and others added 12 commits November 22, 2020 23:01

Rollup merge of #79267 - ssomers:btree_namespaces, r=Mark-Simulacrum

5793fa9

BTreeMap: address namespace conflicts Fix an annoyance popping up whenever synchronizing the test cases with a version capable of miri-track-raw-pointers. r? `@Mark-Simulacrum`

Rollup merge of #79295 - ssomers:btree_fix_78903, r=Mark-Simulacrum

b54838f

BTreeMap: fix minor testing mistakes in #78903 Mostly a duplicate test case r? `@Mark-Simulacrum`

Rollup merge of #79297 - ssomers:btree_post_redux, r=Mark-Simulacrum

d39e095

BTreeMap: swap the names of NodeRef::new and Root::new_leaf #78104 preserved the name of Root::new_leaf to minimize changes, but the resulting names are confusing. r? `@Mark-Simulacrum`

Stabilize IpAddr::is_ipv4 and is_ipv6 as const

3f8fdf8

Insta-stabilize the methods `is_ipv4` and `is_ipv6` of `IpAddr`. Possible because of the recent stabilization of const control flow. Also adds a test for these methods in a const context.

Bump version to 1.50.0

4613bc9

Auto merge of #79172 - a1phyr:cold_abort, r=Mark-Simulacrum

f32459c

Add #[cold] attribute to `std::process::abort` and `alloc::alloc::handle_alloc_error`

Merge branch 'master' of https://github.com/rust-lang/rust into yk-sy…

9f03147

…nc-upstream-20201123

vext01 assigned ptersilie Nov 23, 2020

bors bot merged commit c49f50f into softdevteam:master Nov 24, 2020

vext01 deleted the yk-sync-upstream-20201123 branch November 24, 2020 11:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sync upstream #147

sync upstream #147

vext01 commented Nov 23, 2020

ptersilie commented Nov 23, 2020

bors bot commented Nov 23, 2020

vext01 commented Nov 24, 2020

ltratt commented Nov 24, 2020

vext01 commented Nov 24, 2020

ltratt commented Nov 24, 2020

vext01 commented Nov 24, 2020

bors bot commented Nov 24, 2020

vext01 commented Nov 24, 2020

vext01 commented Nov 24, 2020

ptersilie commented Nov 24, 2020

bors bot commented Nov 24, 2020

vext01 commented Nov 24, 2020

sync upstream #147

sync upstream #147

Conversation

vext01 commented Nov 23, 2020

ptersilie commented Nov 23, 2020

bors bot commented Nov 23, 2020

vext01 commented Nov 24, 2020

ltratt commented Nov 24, 2020

vext01 commented Nov 24, 2020

ltratt commented Nov 24, 2020

vext01 commented Nov 24, 2020

bors bot commented Nov 24, 2020

vext01 commented Nov 24, 2020

vext01 commented Nov 24, 2020

ptersilie commented Nov 24, 2020

bors bot commented Nov 24, 2020

vext01 commented Nov 24, 2020