1. 29 3月, 2017 3 次提交
  2. 28 3月, 2017 19 次提交
  3. 27 3月, 2017 8 次提交
  4. 26 3月, 2017 10 次提交
    • B
      Auto merge of #40826 - frewsxcv:rollup, r=frewsxcv · 7846dbe0
      bors 提交于
      Rollup of 7 pull requests
      
      - Successful merges: #40642, #40734, #40740, #40771, #40807, #40820, #40821
      - Failed merges:
      7846dbe0
    • A
      change string references in asciiext r? @steveklabnik · 6e6dec0c
      aStoate 提交于
      6e6dec0c
    • B
      Auto merge of #40501 - jseyfried:shadow_builtin_macros, r=nrc · bcfd5c48
      bors 提交于
      Allow `use` macro imports to shadow global macros
      
      Terminology:
       - global scope: builtin macros, macros from the prelude, `#[macro_use]`, or `#![plugin(..)]`.
       - legacy scope: crate-local `macro_rules!`.
       - modern scope: `use` macro imports, `macro` (once implemented).
      
      Today, the legacy scope can shadow the global scope (modulo RFC 1560 expanded shadowing restrictions). However, the modern scope cannot shadow or be shadowed by either the global or legacy scopes, leading to ambiguity errors.
      
      This PR allows the modern scope to shadow the global scope (subject to some restrictions).
      More specifically, a name in the global scope is as shadowable as a glob import in the module `self`. In other words, we imagine a special, implicit glob import in each module item:
      ```rust
      mod foo {
          #[lexical_only] // Not accessible via `foo::<name>`, like pre-RFC 1560 `use` imports.
          #[shadowable_by_legacy_scope] // for back-compat
          use <global_macros>::*;
      }
      ```
      
      r? @nrc
      bcfd5c48
    • B
      Auto merge of #40347 - alexcrichton:rm-liblog, r=brson · 7dd4e2db
      bors 提交于
      Remove internal liblog
      
      This commit deletes the internal liblog in favor of the implementation that
      lives on crates.io. Similarly it's also setting a convention for adding crates
      to the compiler. The main restriction right now is that we want compiler
      implementation details to be unreachable from normal Rust code (e.g. requires a
      feature), and by default everything in the sysroot is reachable via `extern
      crate`.
      
      The proposal here is to require that crates pulled in have these lines in their
      `src/lib.rs`:
      
          #![cfg_attr(rustbuild, feature(staged_api, rustc_private))]
          #![cfg_attr(rustbuild, unstable(feature = "rustc_private", issue = "27812"))]
      
      This'll mean that by default they're not using these attributes but when
      compiled as part of the compiler they do a few things:
      
      * Mark themselves as entirely unstable via the `staged_api` feature and the
        `#![unstable]` attribute.
      * Allow usage of other unstable crates via `feature(rustc_private)` which is
        required if the crate relies on any other crates to compile (other than std).
      7dd4e2db
    • B
      Auto merge of #40809 - alexcrichton:update-sccache-again, r=alexcrichton · 0f5ddb95
      bors 提交于
      travis: Update sccache again
      
      Looks like the last version was built with mio 0.6.5 which now has known bugs
      against it. This build includes mio 0.6.6
      0f5ddb95
    • C
      char::to_uppercase doc typo: use the 'an' article. · 188299e0
      Colin Wallace 提交于
      188299e0
    • C
      char::to_uppercase doc typo: s/lowercase/uppercase/ · 53b70953
      Colin Wallace 提交于
      53b70953
    • B
      Auto merge of #40821 - arielb1:fix-emscripten, r=TimNN · 0e4b4eb6
      bors 提交于
      try to fix the build on emscripten
      
      The "upstream" emscripten tar.gz now extracts to `emsdk-portable` instead of `emsdk_portable`, breaking our CI. It might be better to vendor a specific version of emscripten instead of using the latest, but I could not find a good way of doing that.
      
      r? @alexcrichton
      0e4b4eb6
    • M
      Avoid using libc::sigemptyset on Android · 24be8998
      Marco A L Barbosa 提交于
      24be8998
    • P
      2e14bfe0