- 
        Couldn't load subscription status. 
- Fork 13.9k
Rollup of 13 pull requests #148195
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Open
      
        
      
            Zalathar
  wants to merge
  45
  commits into
  rust-lang:master
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
Zalathar:rollup-zwgxzlx
  
      
      
   
  
    
  
  
  
 
  
      
    base: master
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
                
     Open
            
            Rollup of 13 pull requests #148195
Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    One can use unstable features on stable too, like via an env var
This updates the rust-version file to 4068baf.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 4068baf Filtered ref: da574cbe2d3bcda451b7508b65e82de837b9c92d Upstream diff: rust-lang/rust@4fa824b...4068baf This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
the previous command already builds using in-tree std
I had a test I was confused by; the root issue is that `error-pattern` runs before normalization, even though `//~ ERROR` runs after normalization. This logging caught the issue immediately.
Add the gpu version of the kernel which was missing in the docs
To avoid linker errors like
    relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.data.rel.ro..L.hwasan'
we need to have `-C target-feature=+tagged-globals`, which is documented here:
https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html#hwaddresssanitizer
    I accidentally commited some things with my name/email swapped ^^'
The LoongArch C/C++ cross toolchain defaults to the `normal` code model, which can cause relocation overflows when linking LLVM after upgrading to verion 22. This change uses the `medium`code model for `loongarch64-linux-gnu` and `loongarch64-linux-musl` builds to avoid these linking errors.
This updates the rust-version file to b1b464d.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: b1b464d Filtered ref: f94cd4e7de0695f11c7f0bf0d33bb39ce736c581 Upstream diff: rust-lang/rust@4068baf...b1b464d This merge was created using https://github.com/rust-lang/josh-sync.
remove untrue/contentious statement
Rustc pull update
- Fix 'the the' → 'the' in rustc_const_eval - Fix 'wether' → 'whether' in compiletest - Fix 'is is' → 'is' in rustc_ast_pretty (2 instances) Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
Co-authored-by: Kevin Reid <kpreid@switchb.org>
…=lcnr Rework unsizing coercions in the new solver Replaces rust-lang#141926, contains: - a commit adding tests that fail before this work - the two commits from the previous PR - a commit in which these tests are fixed - finally, a fixup for an in my opinion rather large regression in diagnostics. It's still not perfect, but better? I hope this is roughly what you had in mind Fixes rust-lang/trait-system-refactor-initiative#241 and rust-lang/trait-system-refactor-initiative#238, adding tests for both r? ``@lcnr``
Update target maintainers android.md
…imulacrum 1.91.0 release notes This imports rust-lang#147010 into a PR in preparation for the release next week. It also imports a subset of the Cargo release notes (cc `@rust-lang/cargo).` r? `@rust-lang/release` `@triagebot` ping relnotes-interest-group
…thar compiletest: show output in debug logging I had a test I was confused by; the root issue is that `error-pattern` runs before normalization, even though `//~ ERROR` runs after normalization. This logging caught the issue immediately.
tests/ui/sanitizer/hwaddress.rs: Run on aarch64 and remove cgu hack
To avoid linker errors like
    relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.data.rel.ro..L.hwasan'
we need to have `-C target-feature=+tagged-globals`, which is documented [here](https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html#hwaddresssanitizer).  I learned that [here](llvm/llvm-project#164876 (comment)).
Closes rust-lang#83989
try-job: aarch64-gnu
    Add `coverage` scope for controlling paths in code coverage This PR adds a `coverage` scope (for `-Zremap-path-scope`) for controlling if the paths that ends up in code coverage output should be remapped or not. Currently code coverage use the `macro` scope which is not a appropriate scope for them. Found during the stabilization of `-Zremap-path-scope` rust-lang#147611 (comment) and was asked to be in a separate PR in rust-lang#147611 (comment). r? compiler
…fleLapkin Add a mailmap entry I accidentally commited some things with my name/email swapped ^^'
ci: loongarch64: use medium code model to avoid relocation overflows The LoongArch C/C++ cross toolchain defaults to the `normal` code model, which can cause relocation overflows when linking LLVM after upgrading to verion 22. This change uses the `medium`code model for `loongarch64-linux-gnu` and `loongarch64-linux-musl` builds to avoid these linking errors.
…macro-stepping, r=wesleywiser Re-enable macro-stepping test for AArch64 r? `@ghost` triaging rust-lang#37225 edit: closes rust-lang#37225
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@b9fb8e9. Created using https://github.com/rust-lang/josh-sync. r? ``@ghost``
…ds, r=lcnr Fix typos: duplicate words in comments - Fix 'the the' → 'the' in rustc_const_eval - Fix 'wether' → 'whether' in compiletest - Fix 'is is' → 'is' in rustc_ast_pretty (2 instances)
| Rollup of everything. @bors r+ rollup=never p=5 | 
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      Labels
      
    A-CI
  Area: Our Github Actions CI 
  
    A-compiletest
  Area: The compiletest test runner 
  
    A-LLVM
  Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 
  
    A-meta
  Area: Issues & PRs about the rust-lang/rust repository itself 
  
    A-rustc-dev-guide
  Area: rustc-dev-guide 
  
    A-testsuite
  Area: The testsuite used to check the correctness of rustc 
  
    PG-exploit-mitigations
  Project group: Exploit mitigations 
  
    rollup
  A PR which is a rollup 
  
    S-waiting-on-bors
  Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 
  
    T-bootstrap
  Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 
  
    T-compiler
  Relevant to the compiler team, which will review and decide on the PR/issue. 
  
    T-infra
  Relevant to the infrastructure team, which will review and decide on the PR/issue. 
  
    T-release
  Relevant to the release subteam, which will review and decide on the PR/issue. 
  
    WG-trait-system-refactor
  The Rustc Trait System Refactor Initiative (-Znext-solver) 
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Successful merges:
coveragescope for controlling paths in code coverage #148139 (Addcoveragescope for controlling paths in code coverage)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup