- 
                Notifications
    You must be signed in to change notification settings 
- Fork 13.9k
Make the default stage for x.py configurable #76625
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
          
     Merged
      
      
    
                
     Merged
            
            
          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
    
  
  
    
    d9290b0    to
    52e9fb4      
    Compare
  
    
              
                    pickfire
  
              
              reviewed
              
                  
                    Sep 12, 2020 
                  
              
              
            
            
              
                    pickfire
  
              
              reviewed
              
                  
                    Sep 12, 2020 
                  
              
              
            
            
      
     Merged
  
              
                    pickfire
  
              
              reviewed
              
                  
                    Sep 12, 2020 
                  
              
              
            
            
              
                    pickfire
  
              
              reviewed
              
                  
                    Sep 13, 2020 
                  
              
              
            
            
| Could you squash the commits here? r=me with that done | 
This allows configuring the default stage for each sub-command individually. - Normalize the stage as early as possible, so there's no confusion about which to use. - Don't add an explicit `stage` option in config.toml This offers no more flexibility than `*_stage` and makes it confusing which takes precedence. - Always give `--stage N` precedence over config.toml - Fix bootstrap tests This changes the tests to go through `Config::parse` so that they test the actual defaults, not the dummy ones provided by `default_opts`. To make this workable (and independent of the environment), it does not read `config.toml` for tests.
ea59ec1    to
    328c61c      
    Compare
  
    | @bors r=Mark-Simulacrum | 
| 📌 Commit 328c61c has been approved by  | 
    
  Dylan-DPC-zz 
      pushed a commit
        to Dylan-DPC-zz/rust
      that referenced
      this pull request
    
      Sep 16, 2020 
    
    
      
  
    
      
    
  
…acrum Make the default stage for x.py configurable This also allows configuring each sub-command individually. Possibly rust-lang#76617 should land before this? I don't feel strongly either way, I don't mind waiting. Closes rust-lang#76165. r? @Mark-Simulacrum
| ⌛ Testing commit 328c61c with merge c93c3d91c8202c1111d06e5534c39b1859b3a91a... | 
| ☀️ Test successful - checks-actions, checks-azure | 
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      Labels
      
    merged-by-bors
  This PR was explicitly merged by bors. 
  
    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) 
  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.
  
    
  
    
This also allows configuring each sub-command individually.
Possibly #76617 should land before this? I don't feel strongly either way, I don't mind waiting.
Closes #76165.
r? @Mark-Simulacrum