1. 05 2月, 2016 3 次提交
    • S
      Rollup merge of #31396 - mbrubeck:grammar-stmts, r=alexcrichton · 3cccf261
      Steve Klabnik 提交于
      "stmt" already includes the terminating semicolon.
      3cccf261
    • S
      Rollup merge of #31007 - pra85:license, r=aturon · c98833d4
      Steve Klabnik 提交于
      According to http://www.copyright.gov/circs/circ01.pdf (See screenshot of relevant section below) , listing the first year of publication in the copyright is enough
      
      ![selection_008](https://cloud.githubusercontent.com/assets/829526/12409934/7021c3a6-be95-11e5-8d1a-18f6948571e0.png)
      
      The commits d5c8f626 and f979f91a have changed the copyright years
      
      This commit reverts back those changes, so that license year is again 2014 (As it was, when this license was first introduced in commit 90ba013b  )
      
      --------------------------------------
      Edit 1: Added screenshot
      c98833d4
    • B
      Auto merge of #31360 - pitdicker:fs_tests_cleanup, r=alexcrichton · d0ef7402
      bors 提交于
      - use `symlink_file` and `symlink_dir` instead of the old `soft_link`
      - create a junction instead of a directory symlink for testing recursive_rmdir (as it causes the
        same troubles, but can be created by users without `SeCreateSymbolicLinkPrivilege`)
      - `remove_dir_all` was unable to remove directory symlinks and junctions
      - only run tests that create symlinks if we have the right permissions.
      - rename `Path2` to `Path`
      - remove the global `#[allow(deprecated)]` and outdated comments
      - After factoring out `create_junction()` from the test `directory_junctions_are_directories` and
        removing needlessly complex code, what I was left with was:
        ```
        #[test]
        #[cfg(windows)]
        fn directory_junctions_are_directories() {
            use sys::fs::create_junction;
      
            let tmpdir = tmpdir();
      
            let foo = tmpdir.join("foo");
            let bar = tmpdir.join("bar");
      
            fs::create_dir(&foo).unwrap();
            check!(create_junction(&foo, &bar));
            assert!(bar.metadata().unwrap().is_dir());
        }
        ```
        It test whether a junction is a directory instead of a reparse point. But it actually test the
        target of the junction (which is a directory if it exists) instead of the junction itself, which
        should always be a symlink. So this test is invalid, and I expect it only exists because the
        author was suprised by it. So I removed it.
      
      Some things that do not yet work right:
      - relative symlinks do not accept forward slashes
      - the conversion of paths for `create_junction` is hacky
      - `remove_dir_all` now messes with the internal data of `FileAttr` to be able to remove symlinks.
        We should add some method like `is_symlink_dir()` to it, so code outside the standard library
        can see the difference between file and directory symlinks too.
      d0ef7402
  2. 04 2月, 2016 16 次提交
  3. 03 2月, 2016 21 次提交